Fix on new android version