Changes to PR #524 agreed on yesterday's call