Fix Lollipop incompatibility