diff --git a/lib/datalib.php b/lib/datalib.php
index b86117d23bd..a7f01325681 100644
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -610,12 +610,14 @@ function get_record($table, $field1, $value1, $field2='', $value2='', $field3=''
  * @param string $sql The SQL string you wish to be executed.
  * @return Found record as object. False if not found or error
  */
-function get_record_sql($sql, $expectmultiple=false) {
+function get_record_sql($sql, $expectmultiple=false, $nolimit=false) {
 
     global $db, $CFG;
 
     if (isset($CFG->debug) && $CFG->debug > 7 && !$expectmultiple) {    // Debugging mode - don't use limit
        $limit = '';
+    } else if ($nolimit) {
+       $limit = '';
     } else {
        $limit = ' LIMIT 1';    // Workaround - limit to one record
     }
diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index 0c762c288fa..ab0bb99f2de 100644
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -717,9 +717,10 @@ class assignment_base {
         $limit = sql_paging_limit($offset+1, 1);
 
         $nextid = 0;
-        if (($auser = get_record_sql($select.$sql.$sort.$limit)) !== false) {
+        if (($auser = get_record_sql($select.$sql.$sort.$limit, false, true)) !== false) {
             $nextid = $auser->id;
         }
+
         print_header(get_string('feedback', 'assignment').':'.fullname($user, true).':'.format_string($this->assignment->name));
 
         ///SOme javascript to help with setting up >.>