follow up from PR #535