Bugfix to underscore adding on windows