diff --git a/lib/best_in_place/engine.rb b/lib/best_in_place/engine.rb
index 1f1c5b5c..9df6895c 100644
--- a/lib/best_in_place/engine.rb
+++ b/lib/best_in_place/engine.rb
@@ -1,8 +1,8 @@
 module BestInPlace
   class Engine < Rails::Engine
     initializer 'best_in_place' do
-      ActionView::Base.send(:include, BestInPlace::Helper)
-      ActionController::Base.send(:include, BestInPlace::ControllerExtensions)
+      ActiveSupport.on_load(:action_view) { include BestInPlace::Helper }
+      ActiveSupport.on_load(:action_controller_base) { include BestInPlace::ControllerExtensions }
     end
   end
 end
diff --git a/lib/best_in_place/railtie.rb b/lib/best_in_place/railtie.rb
index 0af81763..629f3513 100644
--- a/lib/best_in_place/railtie.rb
+++ b/lib/best_in_place/railtie.rb
@@ -4,7 +4,7 @@
 module BestInPlace
   class Railtie < ::Rails::Railtie #:nodoc:
     config.after_initialize do
-      BestInPlace::ViewHelpers = ActionView::Base.new({}, {}, "")
+      BestInPlace::ViewHelpers = ActionView::Base.empty
     end
   end
 end