Make the android version work