Fixed rebasing