fixed QA issue HMO-33