diff --git a/application/bootstrap.php b/application/bootstrap.php
index 772327e..cfcfb78 100644
--- a/application/bootstrap.php
+++ b/application/bootstrap.php
@@ -130,7 +130,7 @@ Route::set('default/media', 'media(/<file>)', array('file' => '.+'))
  * Set the routes. Each route must have a minimum of a name, a URI and a set of
  * defaults for the URI.
  */
-Route::set('default', '(<controller>(/<action>(/<id>)))', array('id' => '[a-zA-Z0-9_.-]+'))
+Route::set('default', '(<controller>(/<action>(/)))(<id>)', array('id' => '.*'))
 	->defaults(array(
 		'controller' => 'welcome',
 		'action'     => 'index',
diff --git a/application/classes/controller/redir.php b/application/classes/controller/redir.php
index 8589679..f55ac52 100644
--- a/application/classes/controller/redir.php
+++ b/application/classes/controller/redir.php
@@ -33,9 +33,5 @@ class Controller_Redir extends Controller {
 		else
 			$this->response->body(file_get_contents(Kohana::config('config.defaultfile')));
 	}
-
-	public function action_path() {
-		return $this->action_index();
-	}
 }
 ?>
diff --git a/application/classes/http/exception/404.php b/application/classes/http/exception/404.php
index 9a00f19..eb3c5d0 100644
--- a/application/classes/http/exception/404.php
+++ b/application/classes/http/exception/404.php
@@ -26,6 +26,6 @@ class HTTP_Exception_404 extends Kohana_HTTP_Exception_404 {
 		));
 
 		// Redirect based on path info
-		Request::factory()->redirect('redir/path'.$_SERVER['PATH_INFO']);
+		Request::factory()->redirect('redir/index'.$_SERVER['PATH_INFO']);
 	}
 }