diff --git a/js/questionset.js b/js/questionset.js
index 3d70079..b2eea07 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -890,17 +890,15 @@ H5P.QuestionSet = function (options, contentId, contentData) {
   /**
    * Returns the complete state of question set and sub-content
    *
-   * @returns {Object}
+   * @returns {Object} current state
    */
   this.getCurrentState = function () {
-    var state = {
-      progress: currentQuestion,
+    return {
+      progress: showingSolutions ? questionInstances.length - 1 : currentQuestion,
       answers: questionInstances.map(function (qi) {
         return qi.getCurrentState();
       })
     };
-
-    return state;
   };
 };
 
diff --git a/semantics.json b/semantics.json
index eaaa265..91ab898 100644
--- a/semantics.json
+++ b/semantics.json
@@ -114,7 +114,8 @@
         "H5P.DragQuestion 1.7",
         "H5P.Blanks 1.7",
         "H5P.MarkTheWords 1.6",
-        "H5P.DragText 1.5"
+        "H5P.DragText 1.5",
+        "H5P.TrueFalse 1.0"
       ]
     }
   },