Updated the code to fix the rebase traces.