diff --git a/java/com.sap.sse.test/src/com/sap/see/pairinglist/test/PairingListTemplateFactoryTest.java b/java/com.sap.sse.test/src/com/sap/see/pairinglist/test/PairingListTemplateFactoryTest.java
index 714ed794ae5..2e7099485f6 100644
--- a/java/com.sap.sse.test/src/com/sap/see/pairinglist/test/PairingListTemplateFactoryTest.java
+++ b/java/com.sap.sse.test/src/com/sap/see/pairinglist/test/PairingListTemplateFactoryTest.java
@@ -64,7 +64,8 @@ public class PairingListTemplateFactoryTest {
     @Test
     public void testGeneration() {
         PairingListTemplateFactoryImpl factoryImpl = new PairingListTemplateFactoryImpl();
-        PairingListTemplate example1 = factoryImpl.getOrCreatePairingListTemplate(new PairingFrameProviderTest(15, 3, 18),0);
+        PairingListTemplate example1 = factoryImpl.getOrCreatePairingListTemplate(new PairingFrameProviderTest(15, 3, 18),3);
+        System.out.println(Arrays.deepToString(example1.getPairingListTemplate()));
         PairingListTemplate example6 = factoryImpl.getOrCreatePairingListTemplate(new PairingFrameProviderTest(15, 3, 14),0);
         PairingListTemplate example2 = factoryImpl.getOrCreatePairingListTemplate(new PairingFrameProviderTest(100, 6, 18),0);
         PairingListTemplate example3 = factoryImpl.getOrCreatePairingListTemplate(new PairingFrameProviderTest(10, 3, 30),0);
diff --git a/java/com.sap.sse/src/com/sap/sse/pairinglist/impl/PairingListTemplateImpl.java b/java/com.sap.sse/src/com/sap/sse/pairinglist/impl/PairingListTemplateImpl.java
index d22de909274..22cfc2cfe40 100644
--- a/java/com.sap.sse/src/com/sap/sse/pairinglist/impl/PairingListTemplateImpl.java
+++ b/java/com.sap.sse/src/com/sap/sse/pairinglist/impl/PairingListTemplateImpl.java
@@ -564,9 +564,12 @@ public class PairingListTemplateImpl implements PairingListTemplate {
     
     private int[][] multiplyFlights(int[][] bestPLT, int flightCount, int groupCount, int competitorCount) {
         int[][] result = new int[(flightCount * groupCount) * (flightMultiplier + 1)][competitorCount / groupCount];
-        for (int i = 0; i < bestPLT.length; i++) {
+       
+        for (int flightIndex = 0; flightIndex < flightCount; flightIndex++) {
             for (int x = 0; x <= flightMultiplier; x++) {
-                result[i * (flightMultiplier + 1) + x] = bestPLT[i];
+                for (int groupIndex = 0; groupIndex < groupCount; groupIndex++) {
+                    result[(flightIndex * groupCount * (flightMultiplier + 1) + groupIndex) + x * groupCount] = bestPLT[flightIndex * groupCount + groupIndex];
+                }
             }
         }
         return result;