Fix auto-rebasing