Added enums values reset to nil if not in list