Alternative proposal to PR #5541