fixing CalMap after merge