diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 30d62d16..521b11b9 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -25,24 +25,28 @@ android {
         applicationId = "es.chiteroman.playintegrityfix"
         minSdk = 26
         targetSdk = 35
-        versionCode = 16800
-        versionName = "v16.8"
+        versionCode = 16900
+        versionName = "v16.9"
         multiDexEnabled = false
 
         externalNativeBuild {
             cmake {
                 arguments(
-                    "-DANDROID_STL=none",
-                    "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON",
-                    "-DANDROID_CPP_FEATURES=no-rtti no-exceptions",
                     "-DCMAKE_BUILD_TYPE=MinSizeRel",
-                    "-DCMAKE_CXX_STANDARD=23",
-                    "-DCMAKE_C_STANDARD=23",
-                    "-DCMAKE_CXX_STANDARD_REQUIRED=ON",
-                    "-DCMAKE_C_STANDARD_REQUIRED=ON",
-                    "-DCMAKE_VISIBILITY_INLINES_HIDDEN=ON",
-                    "-DCMAKE_CXX_VISIBILITY_PRESET=hidden",
-                    "-DCMAKE_C_VISIBILITY_PRESET=hidden"
+                    "-DANDROID_STL=none",
+                    "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
+                )
+
+                cFlags(
+                    "-std=c23", "-fvisibility=hidden", "-fvisibility-inlines-hidden"
+                )
+
+                cppFlags(
+                    "-std=c++23",
+                    "-fno-exceptions",
+                    "-fno-rtti",
+                    "-fvisibility=hidden",
+                    "-fvisibility-inlines-hidden"
                 )
             }
         }
diff --git a/app/src/main/cpp/main.cpp b/app/src/main/cpp/main.cpp
index 1a455808..d2b28716 100644
--- a/app/src/main/cpp/main.cpp
+++ b/app/src/main/cpp/main.cpp
@@ -17,7 +17,7 @@
 
 #define PIF_JSON_DEFAULT "/data/adb/modules/playintegrityfix/pif.json"
 
-static std::string DEVICE_INITIAL_SDK_INT = "21";
+static std::string DEVICE_INITIAL_SDK_INT;
 static std::string SECURITY_PATCH;
 static std::string BUILD_ID;
 
diff --git a/app/src/main/java/es/chiteroman/playintegrityfix/EntryPoint.java b/app/src/main/java/es/chiteroman/playintegrityfix/EntryPoint.java
index 8d742b2d..fdbdb3d0 100644
--- a/app/src/main/java/es/chiteroman/playintegrityfix/EntryPoint.java
+++ b/app/src/main/java/es/chiteroman/playintegrityfix/EntryPoint.java
@@ -156,11 +156,6 @@ public static void init(String json) {
         while (it.hasNext()) {
             String key = it.next();
 
-            if ("SPOOF_PACKAGE_MANAGER".equals(key)) {
-                spoofPackageManager = true;
-                continue;
-            }
-
             String value = "";
             try {
                 value = jsonObject.getString(key);
@@ -170,6 +165,11 @@ public static void init(String json) {
 
             if (TextUtils.isEmpty(value)) continue;
 
+            if ("SPOOF_PACKAGE_MANAGER".equals(key) && Boolean.parseBoolean(value)) {
+                spoofPackageManager = true;
+                continue;
+            }
+
             Field field = getFieldByName(key);
 
             if (field == null) continue;
diff --git a/changelog.md b/changelog.md
index 9ac0bc35..ae6e0482 100644
--- a/changelog.md
+++ b/changelog.md
@@ -7,7 +7,9 @@ If not, try removing /data/adb/pif.json file.
 Donations:
 https://www.paypal.com/paypalme/chiteroman
 
-# v16.8
+NOTE: If your ROM is signed with test-keys, modify "SPOOF_PACKAGE_MANAGER" value in /data/adb/modules/playintegrityfix/pif.json and set to "true".
+Remember to kill com.google.android.gms.unstable process after this!
 
-- Fix bootloops
-- Add json key to enable/disable package manager spoofing
+# v16.9
+
+- Update fingerprint, Device verdict passing again ✔
diff --git a/module/module.prop b/module/module.prop
index 2e1c4884..555ebcd3 100644
--- a/module/module.prop
+++ b/module/module.prop
@@ -1,7 +1,7 @@
 id=playintegrityfix
 name=Play Integrity Fix
-version=v16.8
-versionCode=16800
+version=v16.9
+versionCode=16900
 author=chiteroman
 description=Universal modular fix for Play Integrity (and SafetyNet) on devices running Android 8-15
 updateJson=https://raw.githubusercontent.com/chiteroman/PlayIntegrityFix/main/update.json
diff --git a/module/pif.json b/module/pif.json
index 082744f1..920ceaba 100644
--- a/module/pif.json
+++ b/module/pif.json
@@ -1,13 +1,13 @@
 {
-    "ID": "AP31.240517.022",
+    "ID": "AP31.240617.009",
     "BRAND": "google",
     "DEVICE": "husky",
-    "FINGERPRINT": "google/husky_beta/husky:15/AP31.240517.022/11948202:user/release-keys",
+    "FINGERPRINT": "google/husky_beta/husky:15/AP31.240617.009/12094726:user/release-keys",
     "MANUFACTURER": "Google",
     "MODEL": "Pixel 8 Pro",
     "PRODUCT": "husky_beta",
-    "SECURITY_PATCH": "2024-06-05",
+    "SECURITY_PATCH": "2024-07-05",
     "DEVICE_INITIAL_SDK_INT": 21,
-    "SPOOF_PACKAGE_MANAGER": true,
+    "SPOOF_PACKAGE_MANAGER": false,
     "DEBUG": false
 }
\ No newline at end of file
diff --git a/update.json b/update.json
index a5f8e90f..6dab16eb 100644
--- a/update.json
+++ b/update.json
@@ -1,6 +1,6 @@
 {
-  "version": "v16.8",
-  "versionCode": 16800,
-  "zipUrl": "https://github.com/chiteroman/PlayIntegrityFix/releases/download/v16.8/PlayIntegrityFix_v16.8.zip",
+  "version": "v16.9",
+  "versionCode": 16900,
+  "zipUrl": "https://github.com/chiteroman/PlayIntegrityFix/releases/download/v16.9/PlayIntegrityFix_v16.9.zip",
   "changelog": "https://raw.githubusercontent.com/chiteroman/PlayIntegrityFix/main/changelog.md"
 }