Fixing Android Issue