Fixup #339