diff --git a/vndk-detect b/vndk-detect
index 2004fc6..982347a 100644
--- a/vndk-detect
+++ b/vndk-detect
@@ -17,17 +17,17 @@ else
 fi
 if ( getprop ro.hardware | grep -qE '(kirin970|hi3660|hi6250|hi3670)' );then
 	FOUND_HUAWEI=1
-	setprop persist.sys.bt_acl_bypass true
-	setprop persist.sys.camera.huawei true
-	setprop persist.sys.radio.huawei true
 fi
 
-if getprop ro.vendor.build.fingerprint |grep -qiE '(huawei|honor|hi3660)' || [ -n "$FOUND_HUAWEI" ];then
+if getprop ro.vendor.build.fingerprint |grep -qiE '(huawei|honor|hi3660)';then
 	FOUND_HUAWEI=1
-	setprop persist.sys.overlay.huawei true
 fi
 
 if [ -n "$FOUND_HUAWEI" ];then
+	setprop persist.sys.overlay.huawei true
+	setprop persist.sys.bt_acl_bypass true
+ 	setprop persist.sys.camera.huawei true
+ 	setprop persist.sys.radio.huawei true
 	setprop debug.hwui.profile true
 fi