Made it work with Android 5