Fix of thread organizing in map move