fixed QA issue HMO-22