fix for #3340 (Windows tests pending)