fix map, fix grid