adjusted for QA issue HMO-18