diff --git a/htdocs/admin/numberwords.php b/htdocs/admin/numberwords.php
index 09c43cdb7e7..43be39ff2fa 100644
--- a/htdocs/admin/numberwords.php
+++ b/htdocs/admin/numberwords.php
@@ -43,6 +43,7 @@ $outputlangs->setDefaultLang($langs->defaultlang);
 /*
  * Actions
  */
+
 if (! empty($_POST["action"]) && $_POST["action"] == 'setlevel')
 {
 	dolibarr_set_const($db,"SYSLOG_LEVEL",$_POST["level"],'chaine',0,'',0);
@@ -94,12 +95,12 @@ if ($_POST["action"] == 'test' && trim($_POST["value"]) != '')
 
 	if ($_POST["level"])
 	{
-		$object->total_ttc=$_POST["value"];
+		$object->total_ttc=price2num($_POST["value"]);
 		$source='__TOTAL_TTC_WORDS__';
 	}
 	else
 	{
-		$object->number=$_POST["value"];
+		$object->number=price2num($_POST["value"]);
 		$source='__NUMBER_WORDS__';
 	}
 	$newvaltest=make_substitutions($source,array(),$outputlangs,$object);
diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php
index 932c6f1b1c1..23f488aea2b 100644
--- a/htdocs/lib/functions.lib.php
+++ b/htdocs/lib/functions.lib.php
@@ -3232,10 +3232,10 @@ function make_substitutions($chaine,$substitutionarray,$outputlangs,$object='')
         foreach ($conf->file->dol_document_root as $dirroot)
 	    {
 	        // If module enabled and complete
-    		if (! empty($conf->$fonc->enabled) && file_exists($dir.'/functions_'.$fonc.'.lib.php'))
+    		if (! empty($conf->$fonc->enabled) && file_exists($dirroot.'/includes/modules/substitutions/functions_'.$fonc.'.lib.php'))
     		{
-    			dol_syslog("Library functions_".$fonc.".lib.php found into ".$dir);
-    			require_once($dir."/functions_".$fonc.".lib.php");
+    			dol_syslog("Library functions_".$fonc.".lib.php found into ".$dirroot);
+    			require_once($dirroot."/includes/modules/substitutions/functions_".$fonc.".lib.php");
     			numberwords_completesubstitutionarray($substitutionarray,$outputlangs,$object);
     			break;
     		}