Add fix for Lollipop and above.