Hopefully fix /map bugs