Map fix after merge