--- loncom/homework/grades.pm	2006/08/31 20:52:48	1.373
+++ loncom/homework/grades.pm	2006/09/14 17:52:22	1.374
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.373 2006/08/31 20:52:48 albertel Exp $
+# $Id: grades.pm,v 1.374 2006/09/14 17:52:22 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1579,7 +1579,7 @@ sub show_problem {
     if ($removeform) {
 	$rendered=~s|<form(.*?)>||g;
 	$rendered=~s|</form>||g;
-	$rendered=~s|name="submit"|name="would_have_been_submit"|g;
+	$rendered=~s|(<input[^>]*name\s*=\s*"?)(\w+)("?)|$1would_have_been_$2$3|g;
     }
     my $companswer;
     if ($mode eq 'both' or $mode eq 'answer') {