Improve reliablity of map loading