Fixup performance regression