fixed QA issue HMO-34