diff --git a/format-master.xml b/format-master.xml
index 42493e8..d54df6b 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -1172,7 +1172,14 @@
 			HTML markup in the window title. Ick. We do this by just
 			grabbing the values of all descendant text nodes.
 		-->
-		<html><xsl:value-of select="." /></html>
+		<html>
+			<xsl:choose>
+				<xsl:when test="/document/@class = 'assignment'">
+					<xsl:if test="$showanswers='yes'">Sample Solution for </xsl:if>
+				</xsl:when>
+			</xsl:choose>
+			<xsl:value-of select="." />
+		</html>
 	</template>
 
 	<template name="preamble-author" match="document/author" mode="preamble">
@@ -1211,7 +1218,6 @@
 					</xsl:when>
 					<xsl:when test="/document/@class = 'assignment'">
 						<xsl:if test="$showanswers='yes'">Sample Solution for </xsl:if>
-						<BR />
 					</xsl:when>
 				</xsl:choose>
 				<xsl:apply-templates />
