Fix map usage