fix rebase to 28 on windows