Bug fix for Android KitKat