Improved iPhone behaviour