Third modification to support Android Studio