diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedBusVectoRunDataFactory.cs
index 58ca92d5209a7fad7998e209be701d092395c788..359a853404bdb4aa39cb409e7564c3eda6e6a915 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedBusVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedBusVectoRunDataFactory.cs
@@ -168,8 +168,10 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
 						var primarySegment = GetPrimarySegment(PrimaryVehicle);
 						var primaryMission = primarySegment.Missions.Where(
 							m => {
-								return m.BusParameter.DoubleDecker == CompletedVehicle.VehicleCode.IsDoubleDeckerBus() &&
-										m.MissionType == mission.MissionType;
+								return m.BusParameter.DoubleDecker ==
+										CompletedVehicle.VehicleCode.IsDoubleDeckerBus() &&
+										m.MissionType == mission.MissionType && 
+										m.BusParameter.FloorType == CompletedVehicle.VehicleCode.GetFloorType();
 							}).First();
 						simulationRunData = CreateVectoRunDataGeneric(
 							primaryMission,
diff --git a/VectoCore/VectoCore/Models/Declaration/Mission.cs b/VectoCore/VectoCore/Models/Declaration/Mission.cs
index 535e36a5e23f3c47bf7563bf092608219c6d60bd..8ca2926e098127d721ecf98c5914a7289fc817b6 100644
--- a/VectoCore/VectoCore/Models/Declaration/Mission.cs
+++ b/VectoCore/VectoCore/Models/Declaration/Mission.cs
@@ -154,6 +154,7 @@ namespace TUGraz.VectoCore.Models.Declaration
 		public Meter DeltaHeight { get; internal set; }
 		public Meter EntranceHeight { get; set; }
 		public VehicleCode VehicleCode { get; set; }
+		public FloorType FloorType { get; set; }
 	}
 
 	
diff --git a/VectoCore/VectoCore/Models/Declaration/PrimaryBusSegments.cs b/VectoCore/VectoCore/Models/Declaration/PrimaryBusSegments.cs
index 32dc84845e352d9998e939bc03876322610f6d12..c4761fa0d54af707900fd9206ac6773a0cdd70e0 100644
--- a/VectoCore/VectoCore/Models/Declaration/PrimaryBusSegments.cs
+++ b/VectoCore/VectoCore/Models/Declaration/PrimaryBusSegments.cs
@@ -133,6 +133,7 @@ namespace TUGraz.VectoCore.Models.Declaration
 							PassengerDensityRef = passengerDensityRef,
 							DoubleDecker = row.ParseBoolean("doubledecker"),
 							LowEntry = GetLowEntry(row.Field<string>("lowentry")),
+							FloorType = row.Field<string>("floortype").ParseEnum<FloorType>(),
 							EntranceHeight =  row.ParseDouble("entranceheight").SI(Unit.SI.Milli.Meter).Cast<Meter>(),
 							VehicleCode = row.Field<string>("vehiclecode").ParseEnum<VehicleCode>(),
 							HVACConfiguration = BusHVACSystemConfigurationHelper.Parse(row.Field<string>("hvacsystemconfiguration")),