diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef94c85f..5e0f5613 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2.15.1
+
+* Fixed some issues
+
 # 2.15.0
 
 * Changed option `enums_case_sensitive` to correctly default to `true` as stated in documentation
diff --git a/lib/src/code_generators/swagger_enums_generator.dart b/lib/src/code_generators/swagger_enums_generator.dart
index cc7fe650..7156fd92 100644
--- a/lib/src/code_generators/swagger_enums_generator.dart
+++ b/lib/src/code_generators/swagger_enums_generator.dart
@@ -353,9 +353,9 @@ ${allEnums.map((e) => e.toString()).join('\n')}
       );
 
       if (propertiesContainer != null) {
-        properties = propertiesContainer.properties;
+        properties = Map.from(propertiesContainer.properties);
       } else {
-        properties = schema.properties;
+        properties = Map.from(schema.properties);
       }
 
       var allOfRef = allOf.firstWhereOrNull((e) => e.hasRef);
diff --git a/lib/src/code_generators/swagger_models_generator.dart b/lib/src/code_generators/swagger_models_generator.dart
index b9dc9e78..d9d5e720 100644
--- a/lib/src/code_generators/swagger_models_generator.dart
+++ b/lib/src/code_generators/swagger_models_generator.dart
@@ -1689,7 +1689,7 @@ $allHashComponents;
       final allOfSchema = allClasses[allOf.ref.getUnformattedRef()];
 
       if (allOfSchema != null) {
-        final properties = allOfSchema.properties;
+        final properties = Map.from(allOfSchema.properties);
         for (final allOf in allOfSchema.allOf) {
           properties.addAll(allOf.properties);
         }
diff --git a/pubspec.yaml b/pubspec.yaml
index 3ece755a..406a10f3 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: swagger_dart_code_generator
 
-version: 2.15.0
+version: 2.15.1
 
 homepage: https://github.com/epam-cross-platform-lab/swagger-dart-code-generator
 repository: https://github.com/epam-cross-platform-lab/swagger-dart-code-generator