Backport hotfix