fixed problem

occurred after merge