Fix bug #954 (spaces escaped incorrectly on win os)