[DF-551] extra fix for Win32.