Fixed map behavior