--- loncom/homework/structuretags.pm	2005/06/04 02:56:44	1.293
+++ loncom/homework/structuretags.pm	2005/06/28 19:17:36	1.295
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.293 2005/06/04 02:56:44 albertel Exp $
+# $Id: structuretags.pm,v 1.295 2005/06/28 19:17:36 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -510,6 +510,7 @@ sub start_problem {
 	    defined($env{'form.problemtype'})) {
 	    $Apache::lonhomework::type=$env{'form.problemtype'};
 	}
+	$Apache::lonhomework::default_type = $Apache::lonhomework::type;
 	&Apache::lonxml::debug("Found this to be of type :$Apache::ltonhomework::type:");
     }
     if ($Apache::lonhomework::type eq '' ) {
@@ -751,7 +752,8 @@ sub end_problem {
 	}
 	if ($target eq 'answer' && ($env{'request.state'} eq 'construct')
 	    && $env{'form.answer_output_mode'} ne 'tex') {
-	    $result.='</html>'; # normally we get it from xmlend, but in CSTR
+	    $result.=&Apache::lonxml::xmlend().'</html>';
+	                        # normally we get it from above, but in CSTR
 	                        # we always show answer mode too.
 	}
     } elsif ($target eq 'meta') {
@@ -1260,6 +1262,7 @@ sub end_part {
     }
     pop @Apache::inputtags::status;
     $Apache::inputtags::part='';
+    $Apache::lonhomework::type = $Apache::lonhomework::default_type;
     return $result;
 }