diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 2173152..6e31440 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/modules.xml b/.idea/modules.xml
index ff8f99c..744daec 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -4,7 +4,6 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/SchoolPower-Android.iml" filepath="$PROJECT_DIR$/SchoolPower-Android.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/folding-cell/folding-cell.iml" filepath="$PROJECT_DIR$/folding-cell/folding-cell.iml" />
       <module fileurl="file://$PROJECT_DIR$/foldingcell/foldingcell.iml" filepath="$PROJECT_DIR$/foldingcell/foldingcell.iml" />
     </modules>
   </component>
diff --git a/app/build.gradle b/app/build.gradle
index a36f3b7..f246ae9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId 'com.carbonylgroup.schoolpower'
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 19
-        versionName '1.2.6'
+        versionCode 20
+        versionName '1.2.7'
         testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
     }
     buildTypes {
diff --git a/app/release/output.json b/app/release/output.json
index ae14601..c090e7e 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":19,"versionName":"1.2.6","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":20,"versionName":"1.2.7","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/carbonylgroup/schoolpower/data/AssignmentItem.kt b/app/src/main/java/com/carbonylgroup/schoolpower/data/AssignmentItem.kt
index 14b92b4..d90ad0a 100644
--- a/app/src/main/java/com/carbonylgroup/schoolpower/data/AssignmentItem.kt
+++ b/app/src/main/java/com/carbonylgroup/schoolpower/data/AssignmentItem.kt
@@ -81,7 +81,7 @@ class AssignmentItem(json: JSONObject) : Serializable {
                     Pair("late", getStatusIfExists(json, "late")),
                     Pair("missing", getStatusIfExists(json, "missing")),
                     Pair("exempt", getStatusIfExists(json, "exempt")),
-                    Pair("excludeInFinalGrade", !getStatusIfExists(json, "includeInFinalGrade", true))
+                    Pair("excludeInFinalGrade", !getStatusIfExists(json, "includeInFinalGrade", true) && !includeInFinalGrade)
             )
 
         } catch (e: JSONException) {