Fixed issue #625 for VS 2012 and 2013.