Fix for pull request