[Fix] artifact of rebasing