Fixed sintax problem after merge