1620 | Subhas | Refactor pull request #488