diff --git a/app/src/main/res/layout/activity_picking_libero.xml b/app/src/main/res/layout/activity_picking_libero.xml
index 4de2c5e9..8aad8891 100644
--- a/app/src/main/res/layout/activity_picking_libero.xml
+++ b/app/src/main/res/layout/activity_picking_libero.xml
@@ -170,7 +170,7 @@
         android:layout_marginRight="8dp"
         android:src="@drawable/fab_add"
         android:onClick="@{() -> viewmodel.createNewLU()}"
-        android:visibility="@{viewmodel.mtbColt.get() == null ? View.VISIBLE : View.GONE}"
+        android:visibility="@{viewmodel.mtbColt == null ? View.VISIBLE : View.GONE}"
         fab:fab_colorNormal="@color/colorPrimary"
         fab:fab_colorPressed="@color/white_pressed"
         fab:fab_colorRipple="#66FFFFFF"/>
@@ -185,7 +185,7 @@
         android:layout_marginRight="8dp"
         android:src="@drawable/ic_check_white_24dp"
         android:onClick="@{() -> viewmodel.closeLU()}"
-        android:visibility="@{viewmodel.mtbColt.get() != null ? View.VISIBLE : View.GONE}"
+        android:visibility="@{viewmodel.mtbColt != null ? View.VISIBLE : View.GONE}"
         fab:fab_colorNormal="@color/mainGreen"
         fab:fab_colorPressed="@color/white_pressed"
         fab:fab_colorRipple="#66FFFFFF"/>
diff --git a/waterfall_toolbar/src/main/java/it/integry/plugins/waterfalltoolbar/WaterfallToolbar.kt b/waterfall_toolbar/src/main/java/it/integry/plugins/waterfalltoolbar/WaterfallToolbar.kt
index b2222c6f..72a64f99 100644
--- a/waterfall_toolbar/src/main/java/it/integry/plugins/waterfalltoolbar/WaterfallToolbar.kt
+++ b/waterfall_toolbar/src/main/java/it/integry/plugins/waterfalltoolbar/WaterfallToolbar.kt
@@ -300,6 +300,7 @@ open class WaterfallToolbar : androidx.cardview.widget.CardView {
         internal constructor(superState: Parcelable) : super(superState)
 
         companion object {
+            @JvmField
             internal val CREATOR: Parcelable.Creator<SavedState> = object : Parcelable.Creator<SavedState> {
                 override fun createFromParcel(source: Parcel): SavedState {
                     return SavedState(source)