fixed issue with lolipop