Fixup for #394