diff --git a/app/src/main/java/com/utsmm/kbz/MainFragment.java b/app/src/main/java/com/utsmm/kbz/MainFragment.java
index 4f2fc8c..6ddcb05 100644
--- a/app/src/main/java/com/utsmm/kbz/MainFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/MainFragment.java
@@ -160,12 +160,18 @@ public class MainFragment extends DataBindingFragment {
             NexGoSDK.getInstance().cancelCheckCard();
             NexGoSDK.getInstance().closeReader();
             enableHomeButton();
+            enablePinPadSound(false);
 //            disableTaskButton();
 //            BaseApplication.getInstance().deviceEngine.getPlatform().hideNavigationBar();
 //            BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar();
         });
     }
 
+    private void enablePinPadSound(boolean flag) {
+        int result = BaseApplication.getInstance().deviceEngine.getPlatform().enablePinpadBeep(flag);
+        LogUtil.d(TAG, "Pin Pad Beep Result:" + result);
+    }
+
     private void disableHomeButton() {
         int result = BaseApplication.getInstance().deviceEngine.getPlatform().disableHomeButton();
         LogUtil.d(TAG, "Disable Home Button Result:" + result);
diff --git a/app/src/main/java/com/utsmm/kbz/ui/core_ui/CardWaitingFragment.java b/app/src/main/java/com/utsmm/kbz/ui/core_ui/CardWaitingFragment.java
index d3943aa..759f8b3 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/core_ui/CardWaitingFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/core_ui/CardWaitingFragment.java
@@ -256,14 +256,6 @@ public class CardWaitingFragment extends DataBindingFragment implements DataBind
 
         HashSet<CardSlotTypeEnum> allType = new HashSet<>();
         allType.clear();
-//        if(sharedViewModel.getIsSeePhone().getValue() != null && sharedViewModel.getIsSeePhone().getValue()) {
-//            allType.add(CardSlotTypeEnum.RF);
-//            waitTimeout = 20;
-//        } else {
-//            allType.add(CardSlotTypeEnum.ICC1);
-//            allType.add(CardSlotTypeEnum.RF);
-//            allType.add(CardSlotTypeEnum.SWIPE);
-//        }
         if(sharedViewModel.getIsSeePhone().getValue() != null && sharedViewModel.getIsSeePhone().getValue()) {
             allType.add(CardSlotTypeEnum.RF);
             waitTimeout = 20;
@@ -273,7 +265,11 @@ public class CardWaitingFragment extends DataBindingFragment implements DataBind
         } else {
             allType.add(CardSlotTypeEnum.ICC1);
             allType.add(CardSlotTypeEnum.RF);
-            allType.add(CardSlotTypeEnum.SWIPE);
+
+            if(SystemParamsOperation.getInstance().isMagStripeEnabled()) {
+                allType.add(CardSlotTypeEnum.SWIPE);
+            }
+
         }
 
 //        int allType =  AidlConstants.CardType.IC.getValue() | AidlConstants.CardType.MAGNETIC.getValue();
diff --git a/baselib/src/main/java/com/utsmyanmar/baselib/viewModel/EmvBaseViewModel.java b/baselib/src/main/java/com/utsmyanmar/baselib/viewModel/EmvBaseViewModel.java
index bc1b774..d613ee9 100644
--- a/baselib/src/main/java/com/utsmyanmar/baselib/viewModel/EmvBaseViewModel.java
+++ b/baselib/src/main/java/com/utsmyanmar/baselib/viewModel/EmvBaseViewModel.java
@@ -558,6 +558,7 @@ public abstract class  EmvBaseViewModel extends BaseViewModel {
             byte[] panBytes = cardNo.substring( length- 13).getBytes(StandardCharsets.US_ASCII);
             LogUtil.d(TAG,"card num :"+cardNo);
             LogUtil.d(TAG,"Is Online Pin:"+isOnlinePin);
+
 //                            pinPad.inputOnlinePin(supperLen, 60, pan, 0, PinAlgorithmModeEnum.ISO9564FMT0, pinPadInputListener);
             if (isOnlinePin) {
 
diff --git a/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/iso_utils/FieldUtils.java b/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/iso_utils/FieldUtils.java
index 6ae9937..2ec1ad7 100644
--- a/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/iso_utils/FieldUtils.java
+++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/iso_utils/FieldUtils.java
@@ -402,7 +402,11 @@ public class FieldUtils {
                         field.setDataStr("61"); // BPC
 //                        field.setDataStr("00");// MPU
                     } else {
-                        field.setDataStr("00");
+                        if (FALLBACK == cardType){ // Fallback
+                            field.setDataStr("02");
+                        } else {
+                            field.setDataStr("00");
+                        }
                     }