fixed map loading