Fixed up again for windows