1 files changed, 5 insertions, 5 deletions
diff --git a/lib/model_attribute.rb b/lib/model_attribute.rb
index 22c366b37..98bb54b67 100644
--- a/lib/model_attribute.rb
+++ b/lib/model_attribute.rb
@@ -1,12 +1,12 @@
 class ModelAttribute
-  cattr_reader :all
-
-  @@all = []
-
   attr_reader :klass, :name, :data_type
 
+  def self.all
+    @__all__ ||= []
+  end
+
   def self.define(klass, name, data_type)
-    @@all << new(klass, name, data_type)
+    all << new(klass, name, data_type)
   end
 
   def initialize(klass, name, data_type)