diff --git a/application/wizardhelper.class.inc.php b/application/wizardhelper.class.inc.php
index 0f6def805..cc237b7f3 100644
--- a/application/wizardhelper.class.inc.php
+++ b/application/wizardhelper.class.inc.php
@@ -174,7 +174,7 @@ class WizardHelper
 					}
 					$oObj->Set($sAttCode, $value);
 				}
-				else if ($oAttDef instanceof AttributeSet) // AttributeDate is derived from AttributeDateTime
+				else if ($oAttDef instanceof AttributeTagSet) // AttributeDate is derived from AttributeDateTime
 				{
 					$value = json_decode($value, true);
 					$oTagSet = new ormTagSet(get_class($oObj), $sAttCode);
@@ -182,6 +182,14 @@ class WizardHelper
 					$oTagSet->ApplyDelta($value);
 					$oObj->Set($sAttCode, $oTagSet);
 				}
+				else if ($oAttDef instanceof AttributeSet) // AttributeDate is derived from AttributeDateTime
+				{
+					$value = json_decode($value, true);
+					$oTagSet = new ormSet(get_class($oObj), $sAttCode);
+					$oTagSet->SetValues($value['orig_value']);
+					$oTagSet->ApplyDelta($value);
+					$oObj->Set($sAttCode, $oTagSet);
+				}
 				else
 				{
 					$oObj->Set($sAttCode, $value);