adjusted for QA issue HMO-15