Fix new map regression