Fix to work on Android 4.0.4 - #8542