Adding a replacement forgotten during the proposed fix for #1614...