Fix map repeat and position