diff --git a/README.md b/README.md
index 15faffe42d..23dee7fd14 100644
--- a/README.md
+++ b/README.md
@@ -114,7 +114,7 @@ You can include this library from Sonatype OSS for SNAPSHOTS, or Maven central f
 <dependency>
   <groupId>io.swagger.parser.v3</groupId>
   <artifactId>swagger-parser</artifactId>
-  <version>2.1.20</version>
+  <version>2.1.21</version>
 </dependency>
 ```
 
diff --git a/modules/swagger-parser-cli/pom.xml b/modules/swagger-parser-cli/pom.xml
index 87f842748e..22875309fd 100644
--- a/modules/swagger-parser-cli/pom.xml
+++ b/modules/swagger-parser-cli/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>swagger-parser-project</artifactId>
         <groupId>io.swagger.parser.v3</groupId>
-        <version>2.1.21-SNAPSHOT</version>
+        <version>2.1.22-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -91,7 +91,7 @@
         <dependency>
             <groupId>io.swagger.parser.v3</groupId>
             <artifactId>swagger-parser-v3</artifactId>
-            <version>2.1.21-SNAPSHOT</version>
+            <version>2.1.22-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/modules/swagger-parser-core/pom.xml b/modules/swagger-parser-core/pom.xml
index 3af87e6b2b..02108f8879 100644
--- a/modules/swagger-parser-core/pom.xml
+++ b/modules/swagger-parser-core/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger.parser.v3</groupId>
         <artifactId>swagger-parser-project</artifactId>
-        <version>2.1.21-SNAPSHOT</version>
+        <version>2.1.22-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/swagger-parser-safe-url-resolver/pom.xml b/modules/swagger-parser-safe-url-resolver/pom.xml
index 65b60afa05..e2b7f8ec2f 100644
--- a/modules/swagger-parser-safe-url-resolver/pom.xml
+++ b/modules/swagger-parser-safe-url-resolver/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.swagger.parser.v3</groupId>
         <artifactId>swagger-parser-project</artifactId>
-        <version>2.1.21-SNAPSHOT</version>
+        <version>2.1.22-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
 
     </parent>
diff --git a/modules/swagger-parser-v2-converter/pom.xml b/modules/swagger-parser-v2-converter/pom.xml
index 9e39087e6b..3a990c3d11 100644
--- a/modules/swagger-parser-v2-converter/pom.xml
+++ b/modules/swagger-parser-v2-converter/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger.parser.v3</groupId>
         <artifactId>swagger-parser-project</artifactId>
-        <version>2.1.21-SNAPSHOT</version>
+        <version>2.1.22-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/swagger-parser-v3/pom.xml b/modules/swagger-parser-v3/pom.xml
index c0e23c8aa4..3bdfce002a 100644
--- a/modules/swagger-parser-v3/pom.xml
+++ b/modules/swagger-parser-v3/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger.parser.v3</groupId>
         <artifactId>swagger-parser-project</artifactId>
-        <version>2.1.21-SNAPSHOT</version>
+        <version>2.1.22-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/InlineModelResolver.java b/modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/InlineModelResolver.java
index 045697168e..6cfd900161 100644
--- a/modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/InlineModelResolver.java
+++ b/modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/InlineModelResolver.java
@@ -680,6 +680,11 @@ public Schema createModelFromProperty(Schema schema, String path) {
                 flattenProperties(properties, path);
                 model.setProperties(properties);
             }
+            if (schema instanceof ComposedSchema){
+                model.setAllOf(((ComposedSchema) schema).getAllOf());
+                model.setAnyOf(((ComposedSchema) schema).getAnyOf());
+                model.setOneOf(((ComposedSchema) schema).getOneOf());
+            }
 
             return model;
         }
diff --git a/modules/swagger-parser/pom.xml b/modules/swagger-parser/pom.xml
index d68a137eef..5c039c41a0 100644
--- a/modules/swagger-parser/pom.xml
+++ b/modules/swagger-parser/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger.parser.v3</groupId>
         <artifactId>swagger-parser-project</artifactId>
-        <version>2.1.21-SNAPSHOT</version>
+        <version>2.1.22-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 36849c6847..13e923ad60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.swagger.parser.v3</groupId>
     <artifactId>swagger-parser-project</artifactId>
-    <version>2.1.21-SNAPSHOT</version>
+    <version>2.1.22-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>swagger-parser-project</name>
     <developers>