Preserve neighbour from map header, we'll need it