diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index 667182f2c73..8e47752f67e 100644
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -155,7 +155,7 @@ class assignment_base {
                      navmenu($this->course, $this->cm));
 
         $groupmode = groupmode($this->course, $this->cm);
-        $currentgroup = setup_and_print_groups($this->course, $groupmode, 'view.php?id=' . $this->cm->id);
+        $this->currentgroup = setup_and_print_groups($this->course, $groupmode, 'view.php?id=' . $this->cm->id);
         
         echo '<div class="reportlink">'.$this->submittedlink().'</div>';
         echo '<div class="clearer"></div>';
@@ -293,7 +293,7 @@ class assignment_base {
             if (!has_capability('moodle/course:managegroups', $context) and (groupmode($this->course, $this->cm) == SEPARATEGROUPS)) {
                 $count = $this->count_real_submissions($this->currentgroup);  // Only their groups
             } else {
-                $count = $this->count_real_submissions();                     // Everyone
+                $count = $this->count_real_submissions($this->currentgroup); // Everyone
             }
             $submitted = '<a href="submissions.php?id='.$this->cm->id.'">'.
                          get_string('viewsubmissions', 'assignment', $count).'</a>';