diff --git a/config/loket-consumer/leidinggevenden/mapping/queries/dl2op/inheritance/Agent.rq b/config/loket-consumer/leidinggevenden/mapping/queries/dl2op/inheritance/Agent.rq
index 8252a85..66d5eb2 100644
--- a/config/loket-consumer/leidinggevenden/mapping/queries/dl2op/inheritance/Agent.rq
+++ b/config/loket-consumer/leidinggevenden/mapping/queries/dl2op/inheritance/Agent.rq
@@ -5,10 +5,11 @@ PREFIX person: <http://www.w3.org/ns/person#>
 CONSTRUCT {
   ?s a dc_terms:Agent .
 } WHERE {
+  ?s a ?type .
+
   VALUES ?type {
     lblodlg:Functionaris
     person:Person
   }
 
-  ?s a ?type .
 }
diff --git a/config/loket-consumer/leidinggevenden/mapping/queries/dl2op/inheritance/AgentInPositie.rq b/config/loket-consumer/leidinggevenden/mapping/queries/dl2op/inheritance/AgentInPositie.rq
index 2505191..e3a97b3 100644
--- a/config/loket-consumer/leidinggevenden/mapping/queries/dl2op/inheritance/AgentInPositie.rq
+++ b/config/loket-consumer/leidinggevenden/mapping/queries/dl2op/inheritance/AgentInPositie.rq
@@ -4,9 +4,8 @@ PREFIX lblodlg: <http://data.lblod.info/vocabularies/leidinggevenden/>
 CONSTRUCT {
   ?s a ch:AgentInPositie .
 } WHERE {
+  ?s a ?type .
   VALUES ?type {
     lblodlg:Functionaris
   }
-
-  ?s a ?type .
 }