diff --git a/lib/lib/model/base.rb b/lib/lib/model/base.rb
index 2e064f0..197c756 100644
--- a/lib/lib/model/base.rb
+++ b/lib/lib/model/base.rb
@@ -494,7 +494,9 @@ def []=(name, value)
     # @return [Hash] all attributes of an instance (name => value)
     ##
     def attributes(*args)
-      @attributes.merge(@arbitrary)
+      Hash[@attributes.keys.map do |name|
+        [ name, self[name] ]
+      end].merge(@arbitrary)
     end
     
     ##