diff --git a/bottom-drawer-scaffold/build.gradle b/bottom-drawer-scaffold/build.gradle
index 5af584c..6dd9ab9 100644
--- a/bottom-drawer-scaffold/build.gradle
+++ b/bottom-drawer-scaffold/build.gradle
@@ -7,7 +7,7 @@ apply from: '../buildCompose.gradle'
 
 ext {
     PUBLISH_GROUP_ID = 'de.charlex.compose'
-    PUBLISH_VERSION = '2.0.0-rc02'
+    PUBLISH_VERSION = '2.0.0-rc03'
     PUBLISH_ARTIFACT_ID = 'bottom-drawer-scaffold'
 }
 
diff --git a/bottom-drawer-scaffold/src/main/java/de/charlex/compose/bottomdrawerscaffold/BottomDrawerScaffold.kt b/bottom-drawer-scaffold/src/main/java/de/charlex/compose/bottomdrawerscaffold/BottomDrawerScaffold.kt
index 1d816c5..97a2dc1 100644
--- a/bottom-drawer-scaffold/src/main/java/de/charlex/compose/bottomdrawerscaffold/BottomDrawerScaffold.kt
+++ b/bottom-drawer-scaffold/src/main/java/de/charlex/compose/bottomdrawerscaffold/BottomDrawerScaffold.kt
@@ -196,20 +196,20 @@ fun BottomDrawerScaffold(
 
 @OptIn(ExperimentalMaterial3Api::class)
 fun BottomSheetScaffoldState.isCollapsed(): Boolean {
-    return bottomSheetState.hasPartiallyExpandedState
+    return bottomSheetState.currentValue == SheetValue.PartiallyExpanded
 }
 
 @OptIn(ExperimentalMaterial3Api::class)
 fun BottomSheetScaffoldState.isExpanded(): Boolean {
-    return bottomSheetState.hasExpandedState
+    return bottomSheetState.currentValue == SheetValue.Expanded
 }
 
 @OptIn(ExperimentalMaterial3Api::class)
 suspend fun BottomSheetScaffoldState.toggle() {
-    if (bottomSheetState.targetValue == SheetValue.Expanded) {
-        bottomSheetState.partialExpand()
-    } else if (bottomSheetState.targetValue == SheetValue.PartiallyExpanded) {
-        bottomSheetState.expand()
+    if (isExpanded()) {
+        collapse()
+    } else if (isCollapsed()) {
+        expand()
     }
 }