diff --git a/libraries/string_mb.lib.php b/libraries/string_mb.lib.php
index 74f71b1b7..641bafea4 100644
--- a/libraries/string_mb.lib.php
+++ b/libraries/string_mb.lib.php
@@ -67,11 +67,10 @@ function PMA_STR_pos($haystack, $needle, $offset = 0)
  * @param   string  $needle
  * @param   string  $haystack
  * @return  integer position of $needle in $haystack or false
- * @todo    add workaround for offset for PHP < 5.2.0
  */
 function PMA_STR_rPos($haystack, $needle, $offset = 0)
 {
-    return mb_strrpos($haystack, $needle);
+    return mb_strrpos($haystack, $needle, $offset);
 }
 
 ?>
diff --git a/libraries/string_native.lib.php b/libraries/string_native.lib.php
index 448528046..f1c47feea 100644
--- a/libraries/string_native.lib.php
+++ b/libraries/string_native.lib.php
@@ -67,7 +67,6 @@ function PMA_STR_pos($haystack, $needle, $offset = 0)
  * @param   string  $needle
  * @param   string  $haystack
  * @return  integer position of $needle in $haystack or false
- * @todo    add workaround for PHP < 5.0.0 only first char of $needle is used
  */
 function PMA_STR_rPos($haystack, $needle, $offset = 0)
 {