CXX-276 fixup