Fixing problem for Android