diff --git a/lib/nfc/helpers/mrtd_helpers.c b/lib/nfc/helpers/mrtd_helpers.c
index 70d740309c9..5e7b58998bc 100644
--- a/lib/nfc/helpers/mrtd_helpers.c
+++ b/lib/nfc/helpers/mrtd_helpers.c
@@ -239,7 +239,7 @@ uint16_t mrtd_bac_decrypt_verify_sm(const uint8_t* data, size_t data_length, uin
     //printf("DO87.Tag: %X\n", do87.tag);
     //printf("DO87.Length: %ld\n", do87.length);
     //printf("DO87.Value: ");
-    //for(uint8_t i=1; i<do87.length; ++i) { printf("%02X ", do87.value[i]); }
+    //for(uint16_t i = 1; i<do87.length; ++i) printf("%02X ", do87.value[i]);
     //printf("\r\n");
 
     if(do87.tag) {
@@ -249,7 +249,7 @@ uint16_t mrtd_bac_decrypt_verify_sm(const uint8_t* data, size_t data_length, uin
             size_t enclength = do87.length - 1;
 
             mrtd_bac_decrypt(encdata, enclength, key_enc, output);
-            printf("Decrypted: "); for(uint8_t i=0; i<enclength; ++i) printf("%02X ", output[i]); printf("\r\n");
+            printf("Decrypted: "); for(uint16_t i = 0; i < enclength; ++i) printf("%02X ", output[i]); printf("\r\n");
 
             //TODO: function mrtd_bac_unpad?
             int padidx;
diff --git a/lib/nfc/protocols/mrtd.c b/lib/nfc/protocols/mrtd.c
index 2de96675471..cff6ed6e7a5 100644
--- a/lib/nfc/protocols/mrtd.c
+++ b/lib/nfc/protocols/mrtd.c
@@ -390,7 +390,7 @@ bool parse_ef_dg1(EF_DG1_contents* DG1, const uint8_t* data, size_t length) {
 }
 
 bool mrtd_read_parse_file(MrtdApplication* app, EFFile file) {
-    uint8_t buffer[100];
+    uint8_t buffer[300];
     size_t buf_len;
 
     FURI_LOG_D(TAG, "Read and parse %s (%04X)", file.name, file.file_id);