almost fixed for winshit