Fix for Android Studio