Fixed for Android 4.4 problems