fix an issue on lollipop