Map fixed again