fixed little error when rebasing