diff --git a/compose/scripts/skikoAospCommit b/compose/scripts/skikoAospCommit
index 6d6529138c..cded719445 100644
--- a/compose/scripts/skikoAospCommit
+++ b/compose/scripts/skikoAospCommit
@@ -46,17 +46,12 @@ $SED -i 's/skiko = ".*"/skiko = "'"$SKIKO_VERSION"'"/' $AOSP_COMPOSE_SOURCE/fram
 
 # we have error on the second call of Gradle:
 # Cannot invoke "Build_gradle.getAllFilesWithDependencies()" because "this.this$0.this$0" is null
-fixWindows() {
+fixGradle() {
     rm -rf .gradle
 }
 
 downloadSkiko() {
-    if [[ "$OSTYPE" == "msys" ]]; then
-        fixWindows
-    elif [[ "$OSTYPE" == "win32" ]]; then
-        fixWindows
-    fi
-
+    fixGradle
     $JB_GRADLE -PallowJetbrainsDev=true -PartifactName=$1
 }