Fix for Android version