[WIP] MSVC buffer fix