Fix for Android 10