Fixed broken pull request merge