diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69695ac..c83095e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+### 0.3.7
+
+- **Fixed**: `PassCodeError.tooManyAttempts` logic in `.create` and `.change` `PassCodeOperationType`
+
 ### 0.3.6
 
 - **Update**: PassCodeError, now emmit `tooManyAttempts` in any operation (*create* / *change* / *enter*) type.
diff --git a/LeadKitAdditions.podspec b/LeadKitAdditions.podspec
index f67dce4..aea2008 100644
--- a/LeadKitAdditions.podspec
+++ b/LeadKitAdditions.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name            = "LeadKitAdditions"
-  s.version         = "0.3.6"
+  s.version         = "0.3.7"
   s.summary         = "iOS framework with a bunch of tools for rapid development"
   s.homepage        = "https://github.com/TouchInstinct/LeadKitAdditions"
   s.license         = "Apache License, Version 2.0"
diff --git a/Sources/Controllers/PassCode/ViewModel/BasePassCodeViewModel.swift b/Sources/Controllers/PassCode/ViewModel/BasePassCodeViewModel.swift
index 7b17c35..5e232b8 100644
--- a/Sources/Controllers/PassCode/ViewModel/BasePassCodeViewModel.swift
+++ b/Sources/Controllers/PassCode/ViewModel/BasePassCodeViewModel.swift
@@ -198,9 +198,9 @@ extension BasePassCodeViewModel {
         }
 
         switch passCodeHolder.type {
-        case .create where passCodeHolder.enterStep == .enter:
+        case .create where passCodeHolder.enterStep == .repeatEnter:
             attemptsNumber += 1
-        case .change where passCodeHolder.enterStep == .enter:
+        case .change where passCodeHolder.enterStep == .repeatEnter:
             attemptsNumber += 1
         case .enter:
             attemptsNumber += 1