adjusted for QA issue HMO-22