diff --git a/Interfaces/ZUGFeRDInterface/PropertyValues.vb b/Interfaces/ZUGFeRDInterface/PropertyValues.vb
index f5c98981..c9a9c29b 100644
--- a/Interfaces/ZUGFeRDInterface/PropertyValues.vb
+++ b/Interfaces/ZUGFeRDInterface/PropertyValues.vb
@@ -83,7 +83,9 @@ Public Class PropertyValues
                     _logger.Error(ex)
                     oPropertyValues = New List(Of Object)
                 End Try
-
+                If oRowCount = 0 Then '08.04.2025 MS Added as Workaround for Positions Or oGroupScope = "POSITIONS" !
+                    oRowCount = oPropertyValues.Count
+                End If
                 ' Flatten result value
                 oPropertyValues = GetFinalPropValue(oPropertyValues)
 
@@ -91,9 +93,7 @@ Public Class PropertyValues
                 oPropertyList.Add(oProperty.Value, oPropertyValues)
 
                 ' check the first batch of values to determine the row count
-                If oRowCount = 0 Or oGroupScope = "POSITIONS" Then '08.04.2025 MS Added as Workaround for Positions!
-                    oRowCount = oPropertyValues.Count
-                End If
+
             Next
 
             ' Structure of oPropertyList