Fixing the map problem