Fixed a bug for Android Lollipop