Fixed problem from git merge