diff --git a/framework/router.class.php b/framework/router.class.php
index 14cd6ac89b..c55eb6b1aa 100755
--- a/framework/router.class.php
+++ b/framework/router.class.php
@@ -1324,17 +1324,15 @@ class router
         if(is_dir($classFile)) $classFile .= $this->pathFix . $className;
         $classFile .= '.class.php';
 
-        if(!is_file($classFile)) 
+        if(!helper::import($classFile))
         {
             /* Search in $coreLibRoot. */
             $classFile = $this->coreLibRoot . $className;
             if(is_dir($classFile)) $classFile .= $this->pathFix . $className;
             $classFile .= '.class.php';
-            if(!is_file($classFile)) $this->error("class file $classFile not found", __FILE__, __LINE__, $exit = true);
+            if(!helper::import($classFile)) $this->error("class file $classFile not found", __FILE__, __LINE__, $exit = true);
         }
 
-        helper::import($classFile);
-
         /* If staitc, return. */
         if($static) return true;