HH-40443 fix review