diff --git a/src/JsonSchema/RefResolver.php b/src/JsonSchema/RefResolver.php
index bf9d3848..afe0b741 100644
--- a/src/JsonSchema/RefResolver.php
+++ b/src/JsonSchema/RefResolver.php
@@ -116,7 +116,7 @@ public function resolve($schema, $sourceUri = null)
         // These are all potentially arrays that contain schema objects
         // eg.  type can be a value or an array of values/schemas
         // eg.  items can be a schema or an array of schemas
-        foreach (array('disallow', 'extends', 'items', 'type') as $propertyName) {
+        foreach (array('disallow', 'extends', 'items', 'type', 'allOf', 'anyOf', 'oneOf') as $propertyName) {
             $this->resolveArrayOfSchemas($schema, $propertyName, $sourceUri);
         }
 
diff --git a/tests/JsonSchema/Tests/RefResolverTest.php b/tests/JsonSchema/Tests/RefResolverTest.php
index 0d1dbde5..dd2793fc 100644
--- a/tests/JsonSchema/Tests/RefResolverTest.php
+++ b/tests/JsonSchema/Tests/RefResolverTest.php
@@ -43,7 +43,7 @@ public function resolveProvider() {
                 array(
                     'resolveRef' => 1,
                     'resolveProperty' => 4,
-                    'resolveArrayOfSchemas' => 4,
+                    'resolveArrayOfSchemas' => 7,
                     'resolveObjectOfSchemas' => 3
                 )
             )