diff --git a/convention-plugins/src/main/kotlin/root.publication.gradle.kts b/convention-plugins/src/main/kotlin/root.publication.gradle.kts
index e8735bc..b23201c 100644
--- a/convention-plugins/src/main/kotlin/root.publication.gradle.kts
+++ b/convention-plugins/src/main/kotlin/root.publication.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 object Conf {
     const val GROUP = "net.kigawa"
-    const val VERSION = "3.3.1"
+    const val VERSION = "3.3.2"
 }
 
 group = Conf.GROUP
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e411586..28ee85d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Tue Jun 03 17:25:35 JST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/hakate/src/commonMain/kotlin/net/kigawa/hakate/impl/state/StateContextImpl.kt b/hakate/src/commonMain/kotlin/net/kigawa/hakate/impl/state/StateContextImpl.kt
index a3168bc..e888fbc 100644
--- a/hakate/src/commonMain/kotlin/net/kigawa/hakate/impl/state/StateContextImpl.kt
+++ b/hakate/src/commonMain/kotlin/net/kigawa/hakate/impl/state/StateContextImpl.kt
@@ -4,6 +4,7 @@ import kotlinx.coroutines.*
 import net.kigawa.hakate.api.state.StateContext
 import net.kigawa.hakate.api.state.StateDispatcher
 import net.kigawa.hakate.impl.Utl.suspendApply
+import net.kigawa.hakate.impl.dispatcher.StateDispatcherImpl
 import kotlin.coroutines.EmptyCoroutineContext
 
 class StateContextImpl(
@@ -14,7 +15,7 @@ class StateContextImpl(
         return coroutineScope.launch(block = block)
     }
 
-    override fun dispatcher(): StateDispatcher = dispatcher
+    override fun dispatcher(): StateDispatcher = StateDispatcherImpl(coroutineScope)
     override fun dispatch(
         block: suspend StateContext.() -> Unit,
     ): Job {