HHH-8087 - Fix and test