Fixed bug after pull request