Finally fixes Map 2.