diff --git a/classes/bays/@Motor/Motor.m b/classes/bays/@Motor/Motor.m
index 0d956819c2932deca791f0d9b42ba21185caafb3..4ba795b8ba7e05a721052117793fcb420ef4903e 100644
--- a/classes/bays/@Motor/Motor.m
+++ b/classes/bays/@Motor/Motor.m
@@ -35,7 +35,7 @@ classdef Motor < Bay
         chamberPressure     (1, :)  double          % [Pa] Pressure inside combustion chamber
         pe                  (1, :)  double          % [Pa] Eflux pressure
         time                (1, :)  double          % [s]  Engine time vector
-        cutoffTime          (1, 1)  double          % [s]  Shutdown time
+        cutoffTime                  double          % [s]  Shutdown time
         ignitionTransient   (1, 1)  double          % [s]  Ignition transient duration
         cutoffTransient     (1, 1)  double          % [s]  Cutoff transient duration
         tankLength          (1, 1)  double          % [m]  Tank length
@@ -73,8 +73,7 @@ classdef Motor < Bay
     end
 
     %% Bay implementation
-    % Getters
-    methods
+    methods % Getters
         function value = get.name(obj)
             value = obj.NAME;
         end
@@ -92,8 +91,7 @@ classdef Motor < Bay
         end
     end
 
-    % Setters
-    methods
+    methods % Setters
         function obj = set.name(obj, name)
             obj.NAME = name;
             obj = obj.loadData();
diff --git a/classes/bays/@Motor/loadData.m b/classes/bays/@Motor/loadData.m
index 5bceb7f0ac5df23cee83afadec0c66f142f96741..5365122ad45304f2a76cf444e2d575034c8f0496 100644
--- a/classes/bays/@Motor/loadData.m
+++ b/classes/bays/@Motor/loadData.m
@@ -27,9 +27,10 @@ end
 
 if obj.type == "Hybrid"
     obj.length          = chosenMotor.L;
-    obj.tankLength      = chosenMotor.Ltank;
-    if isempty(obj.tankLength)
+    if isempty(chosenMotor.Ltank)
         obj.tankLength = chosenMotor.LtankPr + chosenMotor.LtankOx;
+    else
+        obj.tankLength = chosenMotor.Ltank;
     end      
     obj.fuelMass        = chosenMotor.mFu;  
     obj.oxidizerMass    = chosenMotor.mOx;        
@@ -39,7 +40,7 @@ if obj.type == "Hybrid"
     obj.pe              = chosenMotor.Pe(iUniqueTime);   
     obj.ae              = chosenMotor.Ae;   
     obj.fuselageMass    = chosenMotor.mFus; 
-    if isfield(chosenMotor, 'Pc')
+    if ~isempty(chosenMotor.Pc)
         obj.chamberPressure = chosenMotor.Pc;
     end
     obj.MASS            = obj.propellantMass + obj.structureMass;