Fixed #29 (crash on Android 5.0 Lollipop)