Rebase fallout fix