Hot fix for windows