Added fix for MSVC