Fix map reference regression