Fixed for compilation on latest android studio