Another fixup from revision 6ffeb6