diff --git a/armsrc/BigBuf.c b/armsrc/BigBuf.c
index 26af3af0d..b492b4205 100644
--- a/armsrc/BigBuf.c
+++ b/armsrc/BigBuf.c
@@ -121,7 +121,7 @@ void BigBuf_Clear_ext(bool verbose) {
     memset(BigBuf, 0, s_bigbuf_size);
     clear_trace();
     if (verbose) {
-        Dbprintf("Buffer cleared (%i bytes)", s_bigbuf_size);
+        if (g_dbglevel >= DBG_ERROR) Dbprintf("Buffer cleared (%i bytes)", s_bigbuf_size);
     }
 }
 
diff --git a/client/src/cmdhficlass.c b/client/src/cmdhficlass.c
index 77934bac6..ae1b72ac1 100644
--- a/client/src/cmdhficlass.c
+++ b/client/src/cmdhficlass.c
@@ -3172,9 +3172,12 @@ static int CmdHFiClass_TearBlock(const char *Cmd) {
         return PM3_EFAILED;
     }
 
+    // clear trace log
+    SendCommandNG(CMD_BUFF_CLEAR, NULL, 0);
+
     PrintAndLogEx(INFO, "---------------------------------------");
     PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(INFO, "Press " _GREEN_("<Enter>'") " to exit");
+    PrintAndLogEx(INFO, "Press " _GREEN_("<Enter>") " to exit");
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(INFO, "--------------- " _CYAN_("start") " -----------------\n");
     // Main loop
@@ -3223,6 +3226,7 @@ static int CmdHFiClass_TearBlock(const char *Cmd) {
             if (blockno == 1){
                 read_auth = false;
             }
+
             res = iclass_read_block_ex(key, blockno, keyType, elite, rawkey, use_replay, verbose, read_auth, shallow_mod, data_read, false);
             if (res == PM3_SUCCESS && !reread) {
                 if (memcmp(data_read, zeros, 8) == 0) {