Apply Lollipop fix