A follow on from #543.
A follow on from #543.