diff --git a/htdocs/product.class.php b/htdocs/product.class.php
index 1f73c8df6b5d484a8e1ac6c267867d07cd7d94e7..a17110327ab0deb184f2e0e46195b40e7af69da6 100644
--- a/htdocs/product.class.php
+++ b/htdocs/product.class.php
@@ -2389,10 +2389,10 @@ class Product extends CommonObject
 		if (file_exists($dir))
 		{
 			$handle=opendir($dir);
-
 			while (($file = readdir($handle)) != false)
 			{
-				if (is_file($dir.$file)) return true;
+				if (! utf8_check($file)) $file=utf8_encode($file);	// readdir returns ISO
+				if (dol_is_file($dir.$file)) return true;
 			}
 		}
 		return false;
@@ -2418,12 +2418,12 @@ class Product extends CommonObject
 		if (file_exists($dir))
 		{
 			$handle=opendir($dir);
-
 			while (($file = readdir($handle)) != false)
 			{
 				$photo='';
 
-				if (is_file($dir.$file))
+				if (! utf8_check($file)) $file=utf8_encode($file);	// readdir returns ISO
+				if (dol_is_file($dir.$file))
 				{
 					$nbphoto++;
 					$photo = $file;
@@ -2504,7 +2504,6 @@ class Product extends CommonObject
 			while (($file = readdir($handle)) != false)
 			{
 				if (! utf8_check($file)) $file=utf8_encode($file);	// readdir returns ISO
-
 				if (dol_is_file($dir.$file))
 				{
 					$nbphoto++;