diff --git a/zcbor/zcbor.py b/zcbor/zcbor.py
index e807840f..66523238 100755
--- a/zcbor/zcbor.py
+++ b/zcbor/zcbor.py
@@ -1076,10 +1076,10 @@ def skip_condition(self):
             return True
         if self.type in ["LIST", "MAP", "GROUP"]:
             return not self.repeated_multi_var_condition()
-        if self.type == "OTHER":
-            return ((not self.repeated_multi_var_condition())
-                    and (not self.multi_var_condition())
-                    and (self.single_func_impl_condition() or self in self.my_types.values()))
+        # if self.type == "OTHER":
+        #     return ((not self.repeated_multi_var_condition())
+        #             and (not self.multi_var_condition())
+        #             and (self.single_func_impl_condition() or self in self.my_types.values()))
         return False
 
     def set_skipped(self, skipped):
@@ -2194,11 +2194,11 @@ def type_def(self):
         if self.repeated_type_def_condition():
             type_def_list = self.single_var_type(full=False)
             if type_def_list:
-                ret_val.extend([(self.single_var_type(full=False), self.repeated_type_name())])
+                ret_val.extend([(type_def_list, self.repeated_type_name())])
         if self.type_def_condition():
             type_def_list = self.single_var_type()
             if type_def_list:
-                ret_val.extend([(self.single_var_type(), self.type_name())])
+                ret_val.extend([(type_def_list, self.type_name())])
         return ret_val
 
     def type_def_bits(self):