Fix for ST2 and Win