--- loncom/homework/caparesponse/caparesponse.pm	2006/12/19 14:53:18	1.205
+++ loncom/homework/caparesponse/caparesponse.pm	2007/01/25 21:02:25	1.207
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.205 2006/12/19 14:53:18 www Exp $
+# $Id: caparesponse.pm,v 1.207 2007/01/25 21:02:25 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -237,6 +237,13 @@ sub set_answertext {
 	$response_level) = @_;
     &add_in_tag_answer($parstack,$safeeval,$response_level);
 
+    if ($name eq '' || !ref($answer{$name})) {
+	if (ref($answer{$tag_internal_answer_name})) {
+	    $name = $tag_internal_answer_name;
+	} else {
+	    $name = (sort(keys(%answer)))[0];
+	}
+    }
     return if ($name eq '' || !ref($answer{$name}));
 
     my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,
@@ -410,6 +417,7 @@ sub end_numericalresponse {
 		&Apache::lonxml::debug($$parstack[-1] . "\n<br>");
 		
 		if ( &Apache::response::submitted('scantron')) {
+		    &add_in_tag_answer($parstack,$safeeval);
 		    my ($values,$display)=&make_numerical_bubbles($partid,$id,
 						  $target,$parstack,$safeeval);
 		    $response=$values->[$response];