1 files changed, 6 insertions, 3 deletions
diff --git a/activemodel/lib/active_model/callbacks.rb b/activemodel/lib/active_model/callbacks.rb
index 8c10c54b54..b150fc60f7 100644
--- a/activemodel/lib/active_model/callbacks.rb
+++ b/activemodel/lib/active_model/callbacks.rb
@@ -90,10 +90,13 @@ module ActiveModel
     #     
     def define_model_callbacks(*callbacks)
       options = callbacks.extract_options!
-      options = { :terminator => "result == false", :scope => [:kind, :name] }.merge(options)
+      options = { 
+         :terminator => "result == false", 
+         :scope => [:kind, :name], 
+         :only => [:before, :around, :after] 
+      }.merge(options)
 
-      types = Array.wrap(options.delete(:only))
-      types = [:before, :around, :after] if types.empty?
+      types   = Array.wrap(options.delete(:only))
 
       callbacks.each do |callback|
         define_callbacks(callback, options)