diff --git a/question/engine/datalib.php b/question/engine/datalib.php
index 55119f0897c..70d6b3ce052 100644
--- a/question/engine/datalib.php
+++ b/question/engine/datalib.php
@@ -265,7 +265,7 @@ SELECT
     qasd.name,
     qasd.value
 
-FROM      {question_attempts           qa
+FROM      {question_attempts}          qa
 JOIN      {question_usages}            quba ON quba.id               = qa.questionusageid
 LEFT JOIN {question_attempt_steps}     qas  ON qas.questionattemptid = qa.id
 LEFT JOIN {question_attempt_step_data} qasd ON qasd.attemptstepid    = qas.id
@@ -281,7 +281,7 @@ ORDER BY
             throw new coding_exception('Failed to load question_attempt ' . $questionattemptid);
         }
 
-        $record = current($records);
+        $record = $records->current();
         $qa = question_attempt::load_from_records($records, $questionattemptid,
                 new question_usage_null_observer(), $record->preferredbehaviour);
         $records->close();