(MSVC Xbox 1) Fixup solution