diff --git a/android/buildSrc/src/main/kotlin/tornaco/project/android/thanox/Aidl.kt b/android/buildSrc/src/main/kotlin/tornaco/project/android/thanox/Aidl.kt
index 2e9092a4..2bb6ad4c 100644
--- a/android/buildSrc/src/main/kotlin/tornaco/project/android/thanox/Aidl.kt
+++ b/android/buildSrc/src/main/kotlin/tornaco/project/android/thanox/Aidl.kt
@@ -47,6 +47,12 @@ fun Project.addAidlTask() {
     tasks.named("compileJava") {
         dependsOn("idlGen")
     }
+    tasks.named("compileKotlin") {
+        dependsOn("idlGen")
+        if (tasks.findByName("generateProto") != null) {
+            dependsOn("generateProto")
+        }
+    }
     tasks.named("build") {
         dependsOn("idlGen")
     }
diff --git a/android/internal/Thanox-Internal b/android/internal/Thanox-Internal
index dc6dc3d7..89f93c33 160000
--- a/android/internal/Thanox-Internal
+++ b/android/internal/Thanox-Internal
@@ -1 +1 @@
-Subproject commit dc6dc3d773b12711e148367f219b00d54c4b3775
+Subproject commit 89f93c3332e0dd85231c8e0457842f7174f3d896