Fixing the map