Fixing issue for Android