Fixed crashing in the Android App