Fixing for Android