fixed map changing