diff --git a/src/Model/Ensembles/Ensemble.py b/src/Model/Ensembles/Ensemble.py
index 24898fa5..a30fb029 100644
--- a/src/Model/Ensembles/Ensemble.py
+++ b/src/Model/Ensembles/Ensemble.py
@@ -29,9 +29,8 @@ logger = logging.getLogger()
 class Ensemble(SQLSubModel):
     _sub_classes = []
 
-    def __init__(self, id: int = -1,
-                 name: str = "",
-                 function=-1, range=[], target_data=None,
+    def __init__(self, id: int = -1, name: str = "",
+                 function=None, range=[], target_data=None,
                  status=None, owner_scenario=-1):
         super(Ensemble, self).__init__(
             id=id, status=status,
@@ -157,9 +156,12 @@ class Ensemble(SQLSubModel):
 
         brange, length = self._encode_range()
 
-        fid = self._function._pamhyr_id
-        if self._function._data_type == "generic":
+        if self._function is None:
             fid = -1
+        else:
+            fid = self._function._pamhyr_id
+            if self._function._data_type == "generic":
+                fid = -1
 
         data_pid = -1
         if self._target_data is not None:
diff --git a/src/View/Ensembles/Table.py b/src/View/Ensembles/Table.py
index 21c23154..b2db5c15 100644
--- a/src/View/Ensembles/Table.py
+++ b/src/View/Ensembles/Table.py
@@ -86,7 +86,7 @@ class ComboBoxDelegate(QItemDelegate):
                 list(
                     map(
                         lambda s: str(s),
-                        self._study._ens_functions
+                        self._study._ens_functions.lst
                     )
                 )
             )
diff --git a/src/View/Ensembles/UndoCommand.py b/src/View/Ensembles/UndoCommand.py
index ff78c8ce..40292921 100644
--- a/src/View/Ensembles/UndoCommand.py
+++ b/src/View/Ensembles/UndoCommand.py
@@ -49,14 +49,15 @@ class SetTypeCommand(QUndoCommand):
 
         self._ensembles = ensembles
         self._index = index
-        self._old = self._ensembles.get(self._index).type
+        self._old = self._ensembles.get(self._index)\
+                                   .data_type
         self._new = new_value
 
     def undo(self):
-        self._ensembles.get(self._index).type = self._old
+        self._ensembles.get(self._index).data_type = self._old
 
     def redo(self):
-        self._ensembles.get(self._index).type = self._new
+        self._ensembles.get(self._index).data_type = self._new
 
 
 class SetDataCommand(QUndoCommand):
@@ -105,9 +106,7 @@ class AddCommand(QUndoCommand):
 
     def redo(self):
         if self._new is None:
-            self._new = self._ensembles.new(
-                self._reach, self._index
-            )
+            self._new = self._ensembles.new(self._index)
             self._new.edge = self._reach
         else:
             self._ensembles.insert(self._index, self._new)