diff --git a/SeedDMS_Core/Core/inc.ClassAttribute.php b/SeedDMS_Core/Core/inc.ClassAttribute.php
index b6f342295..3e77a5c16 100644
--- a/SeedDMS_Core/Core/inc.ClassAttribute.php
+++ b/SeedDMS_Core/Core/inc.ClassAttribute.php
@@ -177,12 +177,14 @@ class SeedDMS_Core_Attribute { /* {{{ */
 				if($values) {
 					$vsep = $this->getValueSetSeparator();
 					if($valueset) {
+						/* Validation should have been done before
 						$error = false;
 						foreach($values as $v) {
 							if(!in_array($v, $valueset)) { $error = true; break; }
 						}
 						if($error)
 							return false;
+						 */
 						$valuesetstr = $this->_attrdef->getValueSet();
 						$value = $vsep.implode($vsep, $values);
 					} else {
@@ -203,12 +205,14 @@ class SeedDMS_Core_Attribute { /* {{{ */
 					}
 
 					if($valueset) {
+						/* Validation should have been done before
 						$error = false;
 						foreach($values as $v) {
 							if(!in_array($v, $valueset)) { $error = true; break; }
 						}
 						if($error)
 							return false;
+						 */
 						$value = $valuesetstr[0].implode($valuesetstr[0], $values);
 					} else {
 						$value = ','.implode(',', $values);