HHH-7781 - Fix and test