Don't break rebasing with loading