fixed QA issue HMO-36