fix for cpp-4847