Added Mark's MSVC fix