Should now fix the map loading