Fix for my rebase problem