diff --git a/mod/assignment/index.php b/mod/assignment/index.php
index 21dc1acbc93..f4431673066 100644
--- a/mod/assignment/index.php
+++ b/mod/assignment/index.php
@@ -53,8 +53,7 @@
                 $submitted =  "<a href=\"submissions.php?id=$assignment->id\">" .
                                 get_string("viewfeedback", "assignment") . "</a>";
             } else {
-                $count = count_records_select("assignment_submissions",
-                                              "assignment = '$assignment->id' AND timemodified > 0");
+                $count = count(assignment_get_all_submissions($assignment));
                 $submitted = "<a href=\"submissions.php?id=$assignment->id\">" .
                              get_string("viewsubmissions", "assignment", $count) . "</A>";
             }
diff --git a/mod/assignment/view.php b/mod/assignment/view.php
index 441b729f8e1..8b440cc5226 100644
--- a/mod/assignment/view.php
+++ b/mod/assignment/view.php
@@ -47,15 +47,16 @@
                   "", "", true, update_module_button($cm->id, $course->id, $strassignment), navmenu($course, $cm));
 
     if (isteacher($course->id)) {
+        echo '<p align="right">';
         if ($assignment->type == OFFLINE) {
-            echo "<P align=right><A HREF=\"submissions.php?id=$assignment->id\">".
-                  get_string("viewfeedback", "assignment")."</A></P>";
+            echo "<a href=\"submissions.php?id=$assignment->id\">".
+                  get_string("viewfeedback", "assignment")."</a>";
         } else {
-            $count = count_records_select("assignment_submissions", 
-                                          "assignment = '$assignment->id' AND timemodified > 0");
-            echo "<P align=right><A HREF=\"submissions.php?id=$assignment->id\">".
-                  get_string("viewsubmissions", "assignment", $count)."</A></P>";
+            $count = count(assignment_get_all_submissions($assignment));
+            echo "<a href=\"submissions.php?id=$assignment->id\">".
+                  get_string("viewsubmissions", "assignment", $count)."</a>";
         }
+        echo '</p>';
     } else if (!$cm->visible) {
         notice(get_string("activityiscurrentlyhidden"));
     }