diff --git a/cimsparql/sparql/synchronous_machines.sparql b/cimsparql/sparql/synchronous_machines.sparql
index 5a476223..fbcbed19 100644
--- a/cimsparql/sparql/synchronous_machines.sparql
+++ b/cimsparql/sparql/synchronous_machines.sparql
@@ -19,8 +19,8 @@ where {
         # TODO: Seems like cim15 uses SynchronousMachine while cim16 uses RotatingMachine. Will fix this when we have a proper cim16 model
         optional{
           values ?gen_type {cim:NuclearGeneratingUnit cim:MktGeneratingUnit cim:HydroGeneratingUnit cim:WindGeneratingUnit cim:ThermalGeneratingUnit cim:SolarGeneratingUnit}
-          ?machine cim:SynchronousMachine.GeneratingUnit|cim:RotatingMachine.GeneratingUnit ?nullable_gen_unit;
-            a ?gen_type
+          ?machine cim:SynchronousMachine.GeneratingUnit|cim:RotatingMachine.GeneratingUnit ?nullable_gen_unit .
+          ?nullable_gen_unit a ?gen_type
         }
         bind(coalesce(?nullable_gen_unit, URI("http://no-gen-unit")) as ?gen_unit)