Fixed issue with Android 5.0