HHH-7934 - Fix and test