Another fix for consistency on Windows