fixed map-bug