diff --git a/CHANGELOG.md b/CHANGELOG.md
index c034f926b..7b5579a18 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,9 +3,10 @@
 ## [2.0.2] - Unreleased
 
 ### Fixed
-- Fix crash caused by numerical habits with zero target (#903)
-- Fix small issues with font size
+- Fix crash caused by numerical habits with zero target (@iSoron, #903)
+- Fix small issues with font size (@iSoron)
 - Allow fractional target values (@sumanabhi, #911)
+- Fix IllegalStateException in androidx.customview.view (@iSoron, #906)
 
 ## [2.0.1] - 2021-05-09
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BundleSavedState.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BundleSavedState.kt
index 5f8a09395..41c5f5602 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BundleSavedState.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BundleSavedState.kt
@@ -41,7 +41,7 @@ class BundleSavedState : AbsSavedState {
     }
 
     companion object {
-        val CREATOR: Parcelable.Creator<BundleSavedState> =
+        @JvmField val CREATOR: Parcelable.Creator<BundleSavedState> =
             object : ClassLoaderCreator<BundleSavedState> {
                 override fun createFromParcel(
                     source: Parcel,