Backport fixup for error