diff --git a/lib/jpmobile.rb b/lib/jpmobile.rb
index 809778f..0964c8a 100644
--- a/lib/jpmobile.rb
+++ b/lib/jpmobile.rb
@@ -27,16 +27,17 @@ module Jpmobile
   end
 end

-%w(
-  jpmobile/version.rb
-  jpmobile/mobile/abstract_mobile.rb
-  jpmobile/mobile/display.rb
-).each do |lib|
-  require File.expand_path(File.join(File.dirname(__FILE__), lib))
-end
-
 if defined? RAILS_ENV
   Dir[File.expand_path(File.join(File.dirname(__FILE__), 'jpmobile/*.rb'))].sort.each { |lib|
     require lib
   }
+else
+
+  %w(
+    jpmobile/version.rb
+    jpmobile/mobile/abstract_mobile.rb
+    jpmobile/mobile/display.rb
+  ).each do |lib|
+    require File.expand_path(File.join(File.dirname(__FILE__), lib))
+  end
 end