diff --git a/passcodeview/src/main/java/in/arjsna/passcodeview/PassCodeView.java b/passcodeview/src/main/java/in/arjsna/passcodeview/PassCodeView.java
index 8aeaeea..1353387 100644
--- a/passcodeview/src/main/java/in/arjsna/passcodeview/PassCodeView.java
+++ b/passcodeview/src/main/java/in/arjsna/passcodeview/PassCodeView.java
@@ -399,6 +399,8 @@ private void findKeyPressed(int downEventX, int downEventY, int upEventX, int up
       if (keyRect.rect.contains(downEventX, downEventY) && keyRect.rect.contains(upEventX,
           upEventY)) {
         keyRect.playRippleAnim(new KeyRect.RippleAnimListener() {
+          private String currentPassCode;
+
           @Override public void onStart() {
             int length = passCodeText.length();
             if (keyRect.value.equals(eraseChar)) {
@@ -410,11 +412,13 @@ private void findKeyPressed(int downEventX, int downEventY, int upEventX, int up
               passCodeText = passCodeText + keyRect.value;
               setFilledCount(passCodeText.length());
             }
+
+            currentPassCode = passCodeText;
           }
 
           @Override public void onEnd() {
             if (!keyRect.value.isEmpty()) {
-              notifyListener();
+              notifyListener(currentPassCode);
             }
           }
         });
@@ -459,9 +463,9 @@ private void invalidateAndNotifyListener() {
     }
   }
 
-  private void notifyListener() {
+  private void notifyListener(String currentCodeText) {
     if (textChangeListener != null) {
-      textChangeListener.onTextChanged(passCodeText);
+      textChangeListener.onTextChanged(currentCodeText);
     }
   }