Fixing issue with android