-Fixed for Android-L