diff --git a/js/questionset.js b/js/questionset.js
index 7f0218d..7aa037b 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -212,11 +212,11 @@ H5P.QuestionSet = function (options, contentId, contentData) {
 
     // Retrieve questions and indexes
     questions = questionOrdering.map(d => d[0]);
-    questionOrder = questionOrdering.map(d => d[1]);
+    var newOrder = questionOrdering.map(d => questionOrder[d[1]])
 
     return {
       questions:questions,
-      questionOrder:questionOrder
+      questionOrder:newOrder
     };
 
   }