diff --git a/src/libopensc/iso7816.c b/src/libopensc/iso7816.c
index 40458c6c..63645350 100644
--- a/src/libopensc/iso7816.c
+++ b/src/libopensc/iso7816.c
@@ -375,7 +375,11 @@ static int iso7816_process_fci(sc_card_t *card, sc_file_t *file,
 		}
 		name[taglen] = 0;
 		if (ctx->debug >= 3)
-			sc_debug(ctx, "  File name: %s\n", name);
+		{
+			char buf[sizeof(name)*5];
+			sc_hex_dump(ctx, file->name, file->namelen, buf, sizeof(buf));
+			sc_debug(ctx, "  File name: %s\n", buf);
+		}
 	}
 	tag = sc_asn1_find_tag(ctx, p, len, 0x85, &taglen);
 	if (tag != NULL && taglen) {