diff --git a/input/cql/HIVIndicatorElements.cql b/input/cql/HIVIndicatorElements.cql
index 10ef55694ee..4540d28e00b 100644
--- a/input/cql/HIVIndicatorElements.cql
+++ b/input/cql/HIVIndicatorElements.cql
@@ -74,7 +74,9 @@ define "methadone_prescribed at date":
 
 define "methadone_prescribed >= 60mg":
   "methadone_prescribed at date" MR
-    where MR.dosageInstruction >= 60
+    where exists(MR.dosageInstruction d 
+      where exists d.doseAndRate dr
+       where dr.dose.value >= 60)
 
 define "buprenorphine_prescribed at date":
 [MedicationRequest] MR
@@ -87,8 +89,9 @@ define "buprenorphine_prescribed at date":
 
 define "buprenorphine_prescribed >= 8mg":
   "buprenorphine_prescribed at date" MR
-    where MR.dosage >= 8
-
+    where exists(MR.dosageInstruction d 
+      where exists d.doseAndRate dr
+       where dr.dose.value >= 60)
 
 define "OAMT_initiated":
 exists(