Fixed problem with annotate and whitespace on windows