Schema $ref with same name is not producing models properly

My schema definition are spread across multiple files and they are cross reference(using $ref). In these files there is one schema with same name. I have 5 such instances

When i run code generator, Only 2 models are produced. Rest are ignored. Some of the $ref are pointing to wrong model.

I see some issue in the following code.

https://github.com/swagger-api/swagger-parser/blob/master/modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/processors/ExternalRefProcessor.java#L87

            //We add a number at the end of the definition name
            int i = 2;
            for (String name : schemas.keySet()) {
                if (name.equals(possiblyConflictingDefinitionName)) {
                    tryName = possiblyConflictingDefinitionName + "_" + i;
                    existingModel = schemas.get(tryName);
                    i++;
                }

In above code, possiblyConflictingDefinitionName remains same through out the loop. If possiblyConflictingDefinitionName = "model" then the outcome of the loop is always tryName = "model_2".
I am hitting same issue.

So above code should be

           //We add a number at the end of the definition name
            int i = 2;
            tryName = possiblyConflictingDefinitionName;
            for (String name : schemas.keySet()) {
                if (name.equals(tryName)) {
                    tryName = tryName + "_" + i;
                    existingModel = schemas.get(tryName);
                    i++;
                }

Can some one help me to validate this code

Start in modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/processors/ExternalRefProcessor.java around line 87 and inspect the duplicate-definition naming loop. Reproduce the case with schemas spread across multiple files and same-named schemas, then run the code generator to verify that every model is produced and each $ref points to the correct model.