Made the changes asked in the PR 187