DF-1261. Fix for Win32