fixup #2872