Ensured compatibility with VS2010