Addressed comments in PR 782