Fixed issue #44 for MSVC.