Restore msvc fix