diff --git a/mod/assignment/type/upload/assignment.class.php b/mod/assignment/type/upload/assignment.class.php
index 117ebf4..fd6a601 100644
--- a/mod/assignment/type/upload/assignment.class.php
+++ b/mod/assignment/type/upload/assignment.class.php
@@ -411,13 +411,24 @@
         list($enroledsql, $params) = get_enrolled_sql($context, 'mod/assignment:view', $groupid);
         $params['assignmentid'] = $this->cm->instance;
 
-        // Get ids of users enrolled in the given course.
-        return $DB->count_records_sql("SELECT COUNT('x')
+        // Get the count of the assignments submitted
+        $assignment = $DB->get_record('assignment', array('id'=>$cm->instance));
+        if(!(($assignment->var4)==0)){
+            return $DB->count_records_sql("SELECT COUNT('x')
                                          FROM {assignment_submissions} s
                                     LEFT JOIN {assignment} a ON a.id = s.assignment
                                    INNER JOIN ($enroledsql) u ON u.id = s.userid
                                         WHERE s.assignment = :assignmentid AND
-                                              s.data2 = 'submitted'", $params);
+                                            s.data2 = 'submitted' ", $params);
+        }
+        else{
+            return $DB->count_records_sql("SELECT COUNT('x')
+                                         FROM {assignment_submissions} s
+                                    LEFT JOIN {assignment} a ON a.id = s.assignment
+                                   INNER JOIN ($enroledsql) u ON u.id = s.userid
+                                        WHERE s.assignment = :assignmentid
+                                                                     ", $params);
+        }
     }
 
     function print_responsefiles($userid, $return=false) {