map6 fixed