adjusted for QA issue HMO-29