Improve moving to next map.