Another fix for windows