Droid: Fixed the issue that caused app to crash in emulator. Closes #59