Fix to work with Android studio