fix backport regression