--- loncom/homework/lonhomework.pm	2003/07/22 19:55:26	1.138
+++ loncom/homework/lonhomework.pm	2003/09/11 20:03:28	1.140
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.138 2003/07/22 19:55:26 albertel Exp $
+# $Id: lonhomework.pm,v 1.140 2003/09/11 20:03:28 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -69,6 +69,9 @@ sub get_target {
     } elsif ( defined($ENV{'form.grade_target'}  ) 
 	 && ($Apache::lonhomework::viewgrades eq 'F' )) {
       return ($ENV{'form.grade_target'});
+    } elsif (defined($ENV{'form.grade_target'}  ) 
+	 && ($ENV{'form.grade_target'} eq 'answer')) {
+      return ($ENV{'form.grade_target'});
     }
  
     if ( defined($ENV{'form.submitted'}) &&
@@ -657,7 +660,10 @@ sub handler {
     # if we are browsing we might not be able to know where we are
     if ($Apache::lonhomework::browse ne 'F') {
       #should know where we are, so ask
-      $request->internal_redirect('/adm/ambiguous'); return;
+	if ( Apache::exists_config_define("MODPERL2") ) {
+	    &Apache::lonnet::cleanenv();
+	}
+	$request->internal_redirect('/adm/ambiguous'); return;
     }
   }