Fixed issue #480 for VS2010 and 2012. This fix could also resolve issue ...

...#457.