Fix for KitKat API 20 and more