Fix of problem caused by merge