diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php
index 0f1a79467..a8212977f 100644
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
@@ -7406,7 +7406,7 @@ class AttributeCustomFields extends AttributeDefinition
 
 	public function GetEditValue($sValue, $oHostObj = null)
 	{
-		return 'GetEditValueNotImplemented for '.get_class($this);
+		return $this->GetForTemplate($sValue, '', $oHostObj, true);
 	}
 
 	/**
diff --git a/core/excelbulkexport.class.inc.php b/core/excelbulkexport.class.inc.php
index d1e12808a..fc03918b9 100644
--- a/core/excelbulkexport.class.inc.php
+++ b/core/excelbulkexport.class.inc.php
@@ -188,11 +188,6 @@ EOF
 				$oAttDef = MetaModel::GetAttributeDef(get_class($oObj), $sAttCode);
 				$sRet = $oAttDef->GetAsCSV($value, '', '', $oObj);
 			}
-			else if ($value instanceOf ormCustomFieldsValue)
-			{
-				$oAttDef = MetaModel::GetAttributeDef(get_class($oObj), $sAttCode);
-				$sRet = $oAttDef->GetAsCSV($value, "\n", '', $oObj);
-			}
 			else
 			{
 				$oAttDef = MetaModel::GetAttributeDef(get_class($oObj), $sAttCode);
diff --git a/core/spreadsheetbulkexport.class.inc.php b/core/spreadsheetbulkexport.class.inc.php
index fb9eeda25..f84695f83 100644
--- a/core/spreadsheetbulkexport.class.inc.php
+++ b/core/spreadsheetbulkexport.class.inc.php
@@ -175,7 +175,8 @@ EOF
 				}
 				elseif ($oAttDef instanceof AttributeCustomFields)
 				{
-					$sRet = $oObj->GetAsHTML($sAttCode);
+					// Stick to the weird implementation made in GetNextChunk
+					$sRet = utils::TextToHtml($oObj->GetEditValue($sAttCode));
 				}
 				else
 				{
@@ -326,6 +327,12 @@ EOF
 							}
 							$sData .= "<td x:str>$sField</td>";
 						}
+						elseif ($oAttDef instanceof AttributeCustomFields)
+						{
+							// GetAsHTML returns a table that would not fit
+							$sField = utils::TextToHtml($oObj->GetEditValue($sAttCode));
+							$sData .= "<td x:str>$sField</td>";
+						}
 						else if($oAttDef instanceof AttributeString)
 						{
 							$sField = $oObj->GetAsHTML($sAttCode, $this->bLocalizeOutput);