Add fix for windows