Update: Fixing map