Fixed for windows (and 2.7)