Fixed crashing on Lollipop (5.0)