-Fix: fix for win32... to be squashed