Solution fixed for VS 2010