diff --git a/lib/scorpion/rails/job.rb b/lib/scorpion/rails/job.rb
index <HASH>..<HASH> 100644
--- a/lib/scorpion/rails/job.rb
+++ b/lib/scorpion/rails/job.rb
@@ -11,9 +11,7 @@ module Scorpion
         # Setup dependency injection
         base.send :include, Scorpion::Object
         base.send :include, Scorpion::Rails::Nest
-        base.send :around_perform do |job, block|
-          job.send :with_scorpion, &block
-        end
+        base.send :around_perform, :with_scorpion
 
         super
       end
diff --git a/lib/scorpion/rails/mailer.rb b/lib/scorpion/rails/mailer.rb
index <HASH>..<HASH> 100644
--- a/lib/scorpion/rails/mailer.rb
+++ b/lib/scorpion/rails/mailer.rb
@@ -11,9 +11,7 @@ module Scorpion
         # Setup dependency injection
         base.send :include, Scorpion::Object
         base.send :include, Scorpion::Rails::Nest
-        base.send :around_filter do |mailer, block|
-          mailer.with_scorpion &block
-        end
+        base.send :around_filter, :with_scorpion
 
         super
       end
Fix with_scorpion around filter reference in mailer and job mixins