Fixed for android 15