VS 2012 branch Fix