Re #6149. Windows fix.