Fixing bugs for mobile