Backport fix