fixed map behavior