Fix map. :shower: :fire: