Fix the code wrt. a bug in VS.