HHH-7870 - Fix and test