Fixed merge pull request issue.