[WOTGM-738] Additional fix for Win32 and MacOS.