Fix to work with VS 2012