2 files changed, 12 insertions, 5 deletions

diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php
index 1f7850ecf..5c3d19b76 100644
--- a/system/codeigniter/CodeIgniter.php
+++ b/system/codeigniter/CodeIgniter.php
@@ -192,13 +192,20 @@ else
 	{
 		$method = 'index';
 	}
-
-	if ( ! method_exists($CI, $method))
+	
+	if (method_exists($CI, '_remap'))
 	{
-		show_404();
+		$CI->_remap($method);
 	}
+	else
+	{
+		if ( ! method_exists($CI, $method))
+		{
+			show_404();
+		}
 	
-	$CI->$method();
+		$CI->$method();
+	}
 }
 
 /*
diff --git a/system/codeigniter/Common.php b/system/codeigniter/Common.php
index d5bec77fe..1b190e201 100644
--- a/system/codeigniter/Common.php
+++ b/system/codeigniter/Common.php
@@ -175,7 +175,7 @@ function log_message($level = 'error', $message, $php_error = FALSE)
 							$config['log_threshold'], 
 							$config['log_date_format']
 						);
-	}
+	}	
 	
 	$LOG->write_log($level, $message, $php_error);
 }