diff --git a/src/inport/TaskCase.java b/src/inport/TaskCase.java
index e9fd21bc4a5e8ded42b67f7db46aae7058568d1a..f33dac624c553d8ebaa115d007c7a92522e96b9f 100644
--- a/src/inport/TaskCase.java
+++ b/src/inport/TaskCase.java
@@ -660,6 +660,11 @@ public class TaskCase {
                              mt.setIntensity(direction*Double.parseDouble(tokens[8].trim()));
                              mt.setWithMooring(tokens[9].trim().equals("M"));
 
+                             if ((mt.getStorage() != null) && (mt.getBunkerType().isPresent())) {
+                                 mt.setLoaderType(mt.getBunkerType());
+                                 mt.setBunkerType(OptionalInt.empty());
+                             }
+
                              templates.add(mt);
                              m_template.put(mt.getId(), mt);
                          }