fixed QA issue HMO-27