CXX-214 fixup