Fixed bug that makes it crash on Lollipop