fixed QA issue HMO-19