Fix rebasing mess #2