Fix 8247d63 for Win