Review changes for PR #477