Complemented the fix for VS 2010 and 2012.