Fixed problem after merge