Bugfix for Android 5.0 Lollipop (API 21)