diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php
index b487b4fa92a..76423116d62 100644
--- a/htdocs/lib/functions.lib.php
+++ b/htdocs/lib/functions.lib.php
@@ -116,7 +116,7 @@ function dol_buildpath($path,$mode=0)
 			// FIXME Trying to know if a file on disk exist by forging path on disk from url
 			// works only for some web server and some setup. This is bugged when
 			// using proxy, rewriting, virtual path, etc...
-			preg_match('/^([^.]+(\.css)?(\.php)?(\.js)?)/i',$path,$regs);
+            preg_match('/^([^.]+(\.css\.php|\.css|\.js\.php|\.js|\.png|\.jpg|\.php)?)/i',$path,$regs);    // Take part before '?'
 			if (! empty($regs[1])) $filepath = $regs[1];
 			// An alternative for proxy but extremely slow
 			//$url = 'http://'.$_SERVER["SERVER_NAME"].DOL_URL_ROOT.$path;