HHH-8007 - Fix and test