Bug fixed (for mobile dev.)