diff --git a/workflow/engine/classes/model/map/ProcessVariablesMapBuilder.php b/workflow/engine/classes/model/map/ProcessVariablesMapBuilder.php
index 7bc4d9500..b1cf8d837 100644
--- a/workflow/engine/classes/model/map/ProcessVariablesMapBuilder.php
+++ b/workflow/engine/classes/model/map/ProcessVariablesMapBuilder.php
@@ -85,7 +85,7 @@ class ProcessVariablesMapBuilder
 
         $tMap->addColumn('VAR_DEFAULT', 'VarDefault', 'string', CreoleTypes::VARCHAR, false, 32);
 
-        $tMap->addColumn('VAR_ACCEPTED_VALUES', 'VarAcceptedValues', 'string', CreoleTypes::VARCHAR, false, 128);
+        $tMap->addColumn('VAR_ACCEPTED_VALUES', 'VarAcceptedValues', 'string', CreoleTypes::LONGVARCHAR, false, null);
 
     } // doBuild()
 
diff --git a/workflow/engine/classes/model/om/BaseProcessVariables.php b/workflow/engine/classes/model/om/BaseProcessVariables.php
index f8e100ea5..0beeb5bb6 100644
--- a/workflow/engine/classes/model/om/BaseProcessVariables.php
+++ b/workflow/engine/classes/model/om/BaseProcessVariables.php
@@ -91,7 +91,7 @@ abstract class BaseProcessVariables extends BaseObject implements Persistent
      * The value for the var_accepted_values field.
      * @var        string
      */
-    protected $var_accepted_values = '';
+    protected $var_accepted_values;
 
     /**
      * Flag to prevent endless save loop, if this object is referenced
@@ -463,7 +463,7 @@ abstract class BaseProcessVariables extends BaseObject implements Persistent
             $v = (string) $v;
         }
 
-        if ($this->var_accepted_values !== $v || $v === '') {
+        if ($this->var_accepted_values !== $v) {
             $this->var_accepted_values = $v;
             $this->modifiedColumns[] = ProcessVariablesPeer::VAR_ACCEPTED_VALUES;
         }
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index 06019600a..f25081eff 100755
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -3801,7 +3801,7 @@
         <column name="VAR_SQL" type="VARCHAR" size="512" />
         <column name="VAR_NULL" type="TINYINT" size="32" default="0"/>
         <column name="VAR_DEFAULT" type="VARCHAR" size="32" default=""/>
-        <column name="VAR_ACCEPTED_VALUES" type="VARCHAR" size="128" default=""/>
+        <column name="VAR_ACCEPTED_VALUES" type="LONGVARCHAR"/>
     </table>
 </database>
 
diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql
index 3276e8474..5c66b081d 100755
--- a/workflow/engine/data/mysql/schema.sql
+++ b/workflow/engine/data/mysql/schema.sql
@@ -205,7 +205,7 @@ CREATE TABLE `DYNAFORM`
 	`DYN_TYPE` VARCHAR(20) default 'xmlform' NOT NULL,
 	`DYN_FILENAME` VARCHAR(100) default '' NOT NULL,
 	`DYN_CONTENT` MEDIUMTEXT,
-	`DYN_VERSION` INTEGER,
+	`DYN_VERSION` INTEGER  NOT NULL,
 	PRIMARY KEY (`DYN_UID`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8' COMMENT='Forms required';
 #-----------------------------------------------------------------------------
@@ -2079,7 +2079,7 @@ CREATE TABLE `PROCESS_VARIABLES`
 	`VAR_SQL` VARCHAR(512),
 	`VAR_NULL` TINYINT(32) default 0,
 	`VAR_DEFAULT` VARCHAR(32) default '',
-	`VAR_ACCEPTED_VALUES` VARCHAR(128) default '',
+	`VAR_ACCEPTED_VALUES` MEDIUMTEXT,
 	PRIMARY KEY (`VAR_UID`)
 )ENGINE=InnoDB ;
 # This restores the fkey checks, after having unset them earlier
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php b/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php
index 9338fd43f..854eef96f 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php
@@ -372,9 +372,6 @@ class Variable
                     throw new \Exception(\G::LoadTranslation("ID_INVALID_VALUE_ONLY_ACCEPTS_VALUES", array('$var_null','0, 1' )));
                 }
             }
-            if (isset($aData["VAR_ACCEPTED_VALUES"])) {
-                Validator::isString($aData['VAR_ACCEPTED_VALUES'], '$var_accepted_values');
-            }
         } catch (\Exception $e) {
             throw $e;
         }