Fixup of #371