PR #493 feedback