Fixed for MSVC