Fixing issue with Android