fix backport bug