BugFix VS2012 (2)

Replication of #2001