diff --git a/mod/assignment/db/upgrade.php b/mod/assignment/db/upgrade.php
index cce1973c0f6..dc796ddaccb 100644
--- a/mod/assignment/db/upgrade.php
+++ b/mod/assignment/db/upgrade.php
@@ -46,12 +46,11 @@ function xmldb_assignment_upgrade($oldversion) {
         $sqlfrom = "FROM {assignment_submissions} s
                     JOIN {assignment} a ON a.id = s.assignment
                     JOIN {modules} m ON m.name = 'assignment'
-                    JOIN {course_modules} cm ON (cm.module = m.id AND cm.instance = a.id)
-                ORDER BY a.course, s.assignment";
+                    JOIN {course_modules} cm ON (cm.module = m.id AND cm.instance = a.id)";
 
         $count = $DB->count_records_sql("SELECT COUNT('x') $sqlfrom");
 
-        if ($rs = $DB->get_recordset_sql("SELECT s.id, s.userid, s.teacher, s.assignment, a.course, cm.id AS cmid $sqlfrom")) {
+        if ($rs = $DB->get_recordset_sql("SELECT s.id, s.userid, s.teacher, s.assignment, a.course, cm.id AS cmid $sqlfrom ORDER BY a.course, s.assignment")) {
 
             $pbar = new progress_bar('migrateassignmentfiles', 500, true);
 
diff --git a/mod/assignment/version.php b/mod/assignment/version.php
index 3c5ff3c707d..258e0a7dc4e 100644
--- a/mod/assignment/version.php
+++ b/mod/assignment/version.php
@@ -5,7 +5,7 @@
 //  This fragment is called by /admin/index.php
 ////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2008081100;
+$module->version  = 2008081900;
 $module->requires = 2008080701;  // Requires this Moodle version
 $module->cron     = 60;