MSVC compilation issue fixed