fixed map bug (NO HACK)