implemented a fix for windows