Issue #1426 modifications done as per peer review comment from @adamv