HHH-8373 fix and test case