Fixed for VS2010 build