Add fix for Lollipop