fixed problem after merge