diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 3561c45bcc..8b052ad597 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1592,8 +1592,12 @@ void Buffer::writeLaTeXSource(otexstream & os,
 
 		runparams.use_japanese = features.isRequired("japanese");
 
-		if (!output_body)
+		if (!output_body) {
+			// Restore the parenthood if needed
+			if (!runparams.is_child)
+				d->ignore_parent = false;
 			return;
+		}
 
 		// make the body.
 		os << "\\begin{document}\n";
diff --git a/src/graphics/PreviewLoader.cpp b/src/graphics/PreviewLoader.cpp
index 433082b14e..6185681f53 100644
--- a/src/graphics/PreviewLoader.cpp
+++ b/src/graphics/PreviewLoader.cpp
@@ -716,8 +716,6 @@ void PreviewLoader::Impl::dumpPreamble(otexstream & os) const
 	runparams.nice = true;
 	runparams.moving_arg = true;
 	runparams.free_spacing = true;
-	if (buffer_.parent())
-		runparams.is_child = true;
 	buffer_.writeLaTeXSource(os, buffer_.filePath(), runparams, Buffer::OnlyPreamble);
 
 	// FIXME! This is a HACK! The proper fix is to control the 'true'