diff --git a/plugin/ra/src/main/java/org/opencds/cqf/ruler/ra/r4/RiskAdjustmentUser.java b/plugin/ra/src/main/java/org/opencds/cqf/ruler/ra/r4/RiskAdjustmentUser.java
index d25ed4a08..189dab99c 100644
--- a/plugin/ra/src/main/java/org/opencds/cqf/ruler/ra/r4/RiskAdjustmentUser.java
+++ b/plugin/ra/src/main/java/org/opencds/cqf/ruler/ra/r4/RiskAdjustmentUser.java
@@ -382,13 +382,13 @@ default void resolveIssues(Composition composition, MeasureReport report, List<D
 										report.getGroup().forEach(
 												group -> {
 													if (group.hasId() && group.getId().equals(extension.getValue().toString())) {
-														section.addEntry(new Reference(issue.getIdElement()));
+														section.addEntry(new Reference(issue.getIdElement().toUnqualifiedVersionless()));
 														if (group.hasCode()) {
 															section.setCode(group.getCode());
 														}
 													}
 												});
-										section.setFocus(new Reference(report.getIdElement().getValue()));
+										section.setFocus(new Reference(report.getIdElement().toUnqualifiedVersionless()));
 									}
 								});
 						composition.addSection(section);