Fix map very crudely to get something working again