Crash-fix for anroid