Step 2 of fixing the map