diff --git a/tgbotapi.behaviour_builder/api/tgbotapi.behaviour_builder.api b/tgbotapi.behaviour_builder/api/tgbotapi.behaviour_builder.api
index 0a382506f8..b14b50bd07 100644
--- a/tgbotapi.behaviour_builder/api/tgbotapi.behaviour_builder.api
+++ b/tgbotapi.behaviour_builder/api/tgbotapi.behaviour_builder.api
@@ -1610,6 +1610,8 @@ public abstract interface class dev/inmo/tgbotapi/extensions/behaviour_builder/u
 
 public final class dev/inmo/tgbotapi/extensions/behaviour_builder/utils/DefaultCustomBehaviourContextAndTypeReceiverKt {
 	public static final fun botInfo (Ldev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static final fun containsCommand (Ldev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContext;Ljava/lang/String;Ljava/util/List;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static final fun containsCommand (Ldev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContext;Lkotlin/text/Regex;Ljava/util/List;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static final fun containsCommand (Ljava/util/List;Ldev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContext;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static final fun containsCommand (Ljava/util/List;Ldev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContext;Lkotlin/text/Regex;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static final fun optionallyWithDefaultReceiver (Lkotlin/jvm/functions/Function3;ZLdev/inmo/tgbotapi/extensions/behaviour_builder/BehaviourContextData;)Lkotlin/jvm/functions/Function3;
diff --git a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/utils/DefaultCustomBehaviourContextAndTypeReceiver.kt b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/utils/DefaultCustomBehaviourContextAndTypeReceiver.kt
index 6d1552cc37..99a92e472b 100644
--- a/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/utils/DefaultCustomBehaviourContextAndTypeReceiver.kt
+++ b/tgbotapi.behaviour_builder/src/commonMain/kotlin/dev/inmo/tgbotapi/extensions/behaviour_builder/utils/DefaultCustomBehaviourContextAndTypeReceiver.kt
@@ -31,24 +31,28 @@ suspend fun BehaviourContext.botInfo(): ExtendedBot? {
     }
 }
 
-context(textSources: TextSourcesList, bc: BehaviourContext)
-suspend fun containsCommand(commandRegex: Regex) = textSources.any {
+suspend fun BehaviourContext.containsCommand(commandRegex: Regex, textSources: TextSourcesList) = textSources.any {
     val command = it.botCommandTextSourceOrNull() ?.takeIf {
         commandRegex.matches(it.command)
     } ?: return@any false
     if (command.username == null) {
         return@any true
     }
-    val botInfo = bc.botInfo()
+    val botInfo = botInfo()
     if (botInfo == null || command.username == botInfo.username) {
         return@any true
     }
     false
 }
 
+context(textSources: TextSourcesList, bc: BehaviourContext)
+suspend fun containsCommand(commandRegex: Regex) = bc.containsCommand(commandRegex, textSources)
+
 context(textSources: TextSourcesList, bc: BehaviourContext)
 suspend fun containsCommand(command: String) = containsCommand(Regex(command))
 
+suspend fun BehaviourContext.containsCommand(command: String, textSources: TextSourcesList) = containsCommand(Regex(command), textSources)
+
 @Warning("It is internal API and can be changed without notes")
 fun <BC : BehaviourContext, R, U : Update> CustomBehaviourContextAndTypeReceiver<BC, R, U>.withDefaultReceiver(
     data: BehaviourContextData