Fix for some Android versions