diff --git a/app/controllers/file_controller.rb b/app/controllers/file_controller.rb
index b1183e57..8dc9b5b6 100644
--- a/app/controllers/file_controller.rb
+++ b/app/controllers/file_controller.rb
@@ -29,7 +29,6 @@ class FileController < ApplicationController
         send_data(file.content, determine_file_options_for(@file_name, :filename => @file_name))
       else
         @file = WikiFile.new(:file_name => @file_name)
-#        @file = WikiFile.new(@file_name)
         render
       end
     end
diff --git a/config/routes.rb b/config/routes.rb
index e00649a5..6ca08c33 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -16,7 +16,7 @@ ActionController::Routing::Routes.draw do |map|
   map.connect 'web_list', :controller => 'wiki', :action => 'web_list'
 
   connect_to_web map, ':web/edit_web', :controller => 'admin', :action => 'edit_web'
-  connect_to_web map, ':web/files/:id', :controller => 'file', :action => 'file'
+  connect_to_web map, ':web/files/:id', :controller => 'file', :action => 'file', :requirements => {:id => /[-._\w]+/}, :id => nil
   connect_to_web map, ':web/import/:id', :controller => 'file', :action => 'import'
   connect_to_web map, ':web/login', :controller => 'wiki', :action => 'login'
   connect_to_web map, ':web/web_list', :controller => 'wiki', :action => 'web_list'