diff --git a/lib/validates_timeliness/extensions/multiparameter_handler.rb b/lib/validates_timeliness/extensions/multiparameter_handler.rb
index ced8a6a..daf0037 100644
--- a/lib/validates_timeliness/extensions/multiparameter_handler.rb
+++ b/lib/validates_timeliness/extensions/multiparameter_handler.rb
@@ -22,7 +22,7 @@ module ValidatesTimeliness
         if self.class.send(:create_time_zone_conversion_attribute?, name, column_for_attribute(name))
           Time.zone.local(*values)
         else
-          Time.time_with_datetime_fallback(@@default_timezone, *values)
+          Time.time_with_datetime_fallback(self.class.default_timezone, *values)
         end
       end
 
diff --git a/spec/validates_timeliness/extensions/multiparameter_handler_spec.rb b/spec/validates_timeliness/extensions/multiparameter_handler_spec.rb
index 7ee81b8..ede2c6a 100644
--- a/spec/validates_timeliness/extensions/multiparameter_handler_spec.rb
+++ b/spec/validates_timeliness/extensions/multiparameter_handler_spec.rb
@@ -10,11 +10,10 @@ describe ValidatesTimeliness::Extensions::MultiparameterHandler do
   it 'should return string value for invalid datetimes' do
     instantiate_time_object('birth_datetime', [2000, 2, 31, 12, 0, 0]).should == '2000-02-31 12:00:00'
   end
-
-  # This is giving an error in AR for undefined @@default_timezone.
-  # it 'should return Time value for valid datetimes' do
-  #   instantiate_time_object('birth_datetime', [2000, 2, 28, 12, 0, 0]).should be_find_of(Time)
-  # end
+   
+  it 'should return Time value for valid datetimes' do
+    instantiate_time_object('birth_datetime', [2000, 2, 28, 12, 0, 0]).should be_kind_of(Time)
+  end
 
   def instantiate_time_object(name, values)
     employee.send(:instantiate_time_object, name, values)