Fixed issue 440 for both VS 2010 and 2012.