Fixing for VS2010