Good catch, rebase screw-up