#12316: Fix suggested by Colin