diff --git a/src/validations/constraints/fedramp-external-constraints.xml b/src/validations/constraints/fedramp-external-constraints.xml
index 06d61a252..2bf3fd8e6 100644
--- a/src/validations/constraints/fedramp-external-constraints.xml
+++ b/src/validations/constraints/fedramp-external-constraints.xml
@@ -180,14 +180,18 @@
             <let var="statement-id" expression="('ac-1_smt.a', 'ac-2_smt.b')"/>
             <let var="control-id" expression="../../../@control-id"/>
             <let var="component-uuid" expression="@component-uuid"/>
-            <let var="component-type" expression="('policy', 'process-procedure')"/>
+            <expect id="control-statement-missing-policy-component" target=".[../@statement-id = $statement-id]" test="../../../../system-implementation/component[@uuid = $component-uuid and @type='policy']">
+                <formal-name>Required Attachment is Present</formal-name>
+                <prop name="help-url"  namespace="https://docs.oasis-open.org/sarif/sarif/v2.1.0" value="https://automate.fedramp.gov/placeholder" />
+                <message>A FedRAMP SSP MUST define attachments that document control implementation in a policy component. Control statement {../@statement-id} is missing such a policy component.</message>
+            </expect>
             <expect id="control-statement-missing-policy-component"
             target=".[../@statement-id = $statement-id]"
-            test="../../../../system-implementation/component[@uuid = $component-uuid and @type=$component-type]">
+            test="../../../../system-implementation/component[@uuid = $component-uuid and @type='process-procedure']">
                 <formal-name>Required Attachment is Present</formal-name>
                 <prop name="help-url"  namespace="https://docs.oasis-open.org/sarif/sarif/v2.1.0" value="https://automate.fedramp.gov/placeholder" />
                 <message>A FedRAMP SSP MUST define attachments that document control implementation in a policy component. Control statement {../@statement-id} is missing such a policy component.</message>
-            </expect>        
+            </expect>            
         </constraints>
     </context>