diff --git a/lib/fog/vcloud_director/models/compute/catalog_items.rb b/lib/fog/vcloud_director/models/compute/catalog_items.rb
index cb6f33564..2ea18c42f 100644
--- a/lib/fog/vcloud_director/models/compute/catalog_items.rb
+++ b/lib/fog/vcloud_director/models/compute/catalog_items.rb
@@ -12,9 +12,13 @@ module Fog
 
         private
 
+        def ensure_list(items)
+          items.is_a?(Hash) ? [items] : items
+        end
+
         def item_list
           data = service.get_catalog(catalog.id).body
-          items = data[:CatalogItems][:CatalogItem].select { |link| link[:type] == "application/vnd.vmware.vcloud.catalogItem+xml" }
+          items = ensure_list(data[:CatalogItems][:CatalogItem]).select { |link| link[:type] == "application/vnd.vmware.vcloud.catalogItem+xml" }
           items.each{|item| service.add_id_from_href!(item) }
           items
         end