diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/DigitEntryField.swift b/MVMCoreUI/Atomic/Atoms/TextFields/DigitEntryField.swift
index aff5ec75..5fa17417 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/DigitEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/DigitEntryField.swift
@@ -335,8 +335,14 @@ import UIKit
         }
         
         for digitBox in digitBoxes {
-            digitBox.digitField.inputAccessoryView = UIToolbar.getToolbarWithDoneButton(delegate: delegateObject?.observingTextFieldDelegate ?? self,
-                                                                                        action: #selector(observingTextFieldDelegate?.dismissFieldInput))
+            
+            if let observingTextFieldelegate = delegateObject?.observingTextFieldDelegate {
+                digitBox.digitField.inputAccessoryView = UIToolbar.getToolbarWithDoneButton(delegate: observingTextFieldelegate,
+                                                                                            action: #selector(observingTextFieldDelegate?.dismissFieldInput))
+            } else {
+                digitBox.digitField.inputAccessoryView = UIToolbar.getToolbarWithDoneButton(delegate: self,
+                                                                                            action: #selector(dismissFieldInput))
+            }
         }
         
         super.set(with: model, delegateObject, additionalData)