[DF-1249] fix for Win32. Now we have equal behavior under MasOS and Win systems.