diff --git a/lib/dao/dao.class.php b/lib/dao/dao.class.php
index d63b66d829..6fd33efab6 100755
--- a/lib/dao/dao.class.php
+++ b/lib/dao/dao.class.php
@@ -551,8 +551,8 @@ class dao
 
             /* Remove the part after order and limit. */
             $subLength = strlen($sql);
-            $orderPOS  = strripos($sql, 'order ');
-            $limitPOS  = strripos($sql , 'limit');
+            $orderPOS  = strrpos($sql, 'order ');
+            $limitPOS  = strrpos($sql , 'limit');
             if($limitPOS) $subLength = $limitPOS;
             if($orderPOS) $subLength = $orderPOS;
             $sql = substr($sql, 0, $subLength);