diff --git a/app/src/main/java/com/topjohnwu/magisk/core/Const.kt b/app/src/main/java/com/topjohnwu/magisk/core/Const.kt
index b0e49b9b7..1f4ee9c74 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/Const.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/Const.kt
@@ -1,7 +1,6 @@
 package com.topjohnwu.magisk.core
 
 import android.os.Process
-import com.topjohnwu.magisk.BuildConfig
 
 object Const {
 
@@ -26,9 +25,10 @@ object Const {
         const val MIN_VERSION = "v19.0"
         const val MIN_VERCODE = 19000
 
-        fun atLeast_20_2() = Info.env.magiskVersionCode >= 20200
-        fun atLeast_20_4() = Info.env.magiskVersionCode >= 20400
-        fun atLeastCanary() = Info.env.magiskVersionCode > BuildConfig.LATEST_MAGISK / 100 * 100
+        fun atLeast_20_2() = Info.env.magiskVersionCode >= 20200 || isCanary()
+        fun atLeast_20_4() = Info.env.magiskVersionCode >= 20400 || isCanary()
+        fun atLeast_21_0() = Info.env.magiskVersionCode >= 21000 || isCanary()
+        fun isCanary() = Info.env.magiskVersionCode % 100 != 0
     }
 
     object ID {
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/su/SuRequestHandler.kt b/app/src/main/java/com/topjohnwu/magisk/core/su/SuRequestHandler.kt
index cc5123840..cd5f27f11 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/su/SuRequestHandler.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/su/SuRequestHandler.kt
@@ -67,7 +67,7 @@ class SuRequestHandler(
     private suspend fun init(intent: Intent) = withContext(Dispatchers.IO) {
         try {
             val uid: Int
-            if (Const.Version.atLeastCanary()) {
+            if (Const.Version.atLeast_21_0()) {
                 val name = intent.getStringExtra("fifo") ?: throw SuRequestError()
                 uid = intent.getIntExtra("uid", -1).also { if (it < 0) throw SuRequestError() }
                 output = DataOutputStream(FileOutputStream(name).buffered())
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/utils/RootInit.kt b/app/src/main/java/com/topjohnwu/magisk/core/utils/RootInit.kt
index dc5495c35..20db3339a 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/utils/RootInit.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/utils/RootInit.kt
@@ -25,7 +25,7 @@ class RootInit : Shell.Initializer() {
             } else {
                 add("export MAGISKTMP=/sbin/.magisk")
             }
-            if (Const.Version.atLeastCanary()) {
+            if (Const.Version.atLeast_21_0()) {
                 add("export ASH_STANDALONE=1")
                 add("[ -x /data/adb/magisk/busybox ] && exec /data/adb/magisk/busybox sh")
             } else {