HHH-7948 - Fix and test