Fix map missmatch