fixed map rebuild