Fixed pull request merge