diff --git a/mod/assignment/type/upload/assignment.class.php b/mod/assignment/type/upload/assignment.class.php
index 0c2ede4851d..eabfb945990 100644
--- a/mod/assignment/type/upload/assignment.class.php
+++ b/mod/assignment/type/upload/assignment.class.php
@@ -900,8 +900,8 @@ class assignment_upload extends assignment_base {
 
         if (is_enrolled($this->context, $USER, 'mod/assignment:submit')
           and $this->isopen()                                                 // assignment not closed yet
-          and (empty($submission) or $submission->userid == $USER->id)        // his/her own submission
-          and $this->count_user_files($submission->id) < $this->assignment->var1    // file limit not reached
+          and (empty($submission) or ($submission->userid == $USER->id        // his/her own submission
+            and $this->count_user_files($submission->id) < $this->assignment->var1))    // file limit not reached
           and !$this->is_finalized($submission)) {                            // no uploading after final submission
             return true;
         } else {