Preliminary fix for APK upgrade