Fixed problem after latest merge conflict