But no really, fix the windows bug THIS time ...