diff --git a/src_main/core/pivarianttypes.cpp b/src_main/core/pivarianttypes.cpp
index d595a42c..69d12280 100644
--- a/src_main/core/pivarianttypes.cpp
+++ b/src_main/core/pivarianttypes.cpp
@@ -136,13 +136,17 @@ PIVariantTypes::Enum & PIVariantTypes::Enum::operator <<(const PIVariantTypes::E
 
 
 PIVariantTypes::Enum & PIVariantTypes::Enum::operator <<(const PIString & v) {
-	enum_list << Enumerator(enum_list.size(), v);
+	if (enum_list.isEmpty()) {
+		enum_list << Enumerator(0, v);
+	} else {
+		enum_list << Enumerator(enum_list.back().value+1, v);
+	}
 	return *this;
 }
 
 
 PIVariantTypes::Enum & PIVariantTypes::Enum::operator <<(const PIStringList & v) {
 	piForeachC (PIString & s, v)
-		(*this) << s.trimmed();
+		(*this) << s;
 	return *this;
 }