Fix for win