Backport bugfix