Fixed issue HHH-8968