Fixed issue with map loading