diff --git a/VectoCore/VectoCore/Models/Simulation/Data/ModalResult.cs b/VectoCore/VectoCore/Models/Simulation/Data/ModalResult.cs
index 8d949a79f1153bc9441d4b7a08e18c0c5dace62c..25a003a7c49f2edf0b6f52342f754cb51d6f905e 100644
--- a/VectoCore/VectoCore/Models/Simulation/Data/ModalResult.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Data/ModalResult.cs
@@ -352,7 +352,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Data
 		public void RegisterComponent(VectoSimulationComponent component, VectoRunData runData)
 		{
 			switch (component) {
-				case IDrivingCycleInfo d when (d is DistanceBasedDrivingCycle || d is MockDrivingCycle):
+				case IDrivingCycleInfo d when d is DistanceBasedDrivingCycle:
 					CreateColumns(DistanceCycleSignals);
 					break;
 				case IDrivingCycleInfo t when t is MeasuredSpeedDrivingCycle:
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/DriverTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/DriverTest.cs
index ed5124194767a513661acc0758d891f52f37d006..57c13709f6faec92a373c25633251e9f4d0f0405 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/DriverTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/DriverTest.cs
@@ -101,6 +101,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 				RunData = runData,
 			};
 			var mockCycle = new MockDrivingCycle(vehicleContainer, null);
+			modData.Data.CreateColumns(ModalResults.DistanceCycleSignals);
 
 			var driver = new Driver(vehicleContainer, driverData, new DefaultDriverStrategy(vehicleContainer));
 			var engine = new CombustionEngine(vehicleContainer, engineData);
@@ -172,6 +173,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 				RunData = runData
 			};
 			var mockCycle = new MockDrivingCycle(vehicleContainer, null);
+			modData.Data.CreateColumns(ModalResults.DistanceCycleSignals);
 
 			var driver = new Driver(vehicleContainer, driverData, new DefaultDriverStrategy(vehicleContainer));
 			var engine = new CombustionEngine(vehicleContainer, engineData);
@@ -250,6 +252,8 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 
 			var cycleData = DrivingCycleDataReader.ReadFromStream("s,v,grad,stop\n0,0,0,10\n10,20,0,0\n20,21,0,0\n30,22,0,0\n40,23,0,0\n50,24,0,0\n60,25,0,0\n70,26,0,0\n80,27,0,0\n90,28,0,0\n100,29,0,0".ToStream(), CycleType.DistanceBased, "DummyCycle", false);
 			var cycle = new MockDrivingCycle(vehicleContainer, cycleData);
+			modData.Data.CreateColumns(ModalResults.DistanceCycleSignals);
+			
 			var brakes = new Brakes(vehicleContainer);
 			var driver = new Driver(vehicleContainer, driverData, new DefaultDriverStrategy(vehicleContainer));