Slightly slower fix for windows