Fixed issue #434 for both VS 2010 and 2012