HHH-951: fix + test