Addressed comment on pull request