CXX-277 FIXUP