diff --git a/lib/fog/core/attributes.rb b/lib/fog/core/attributes.rb
index 3fad88d3a..5f0ff5ea7 100644
--- a/lib/fog/core/attributes.rb
+++ b/lib/fog/core/attributes.rb
@@ -140,7 +140,7 @@ module Fog
           unless self.class.ignored_attributes.include?(key)
             if aliased_key = self.class.aliases[key]
               send("#{aliased_key}=", value)
-            elsif (self.class.attributes | [:collection, :connection]).include?(key.to_sym)
+            elsif respond_to?("#{key}=")
               send("#{key}=", value)
             else
               attributes.merge!(key => value)