Use a better fix for the character escaping bug in MSYS