fix rebased bug