diff --git a/virtualsmartcard/src/vpicc/virtualsmartcard/CardGenerator.py b/virtualsmartcard/src/vpicc/virtualsmartcard/CardGenerator.py
index eb3ebc4..d1a1622 100644
--- a/virtualsmartcard/src/vpicc/virtualsmartcard/CardGenerator.py
+++ b/virtualsmartcard/src/vpicc/virtualsmartcard/CardGenerator.py
@@ -148,7 +148,7 @@ class CardGenerator(object):
 
         self.mf = MF()
         self.mf.append(TransparentStructureEF(parent=self.mf, fid=0x011c, shortfid=0x1c, data=card_access))
-        self.sam = nPA_SAM()
+        self.sam = nPA_SAM(self.mf)
 
     def __generate_cryptoflex(self):
         """Generate the Filesystem and SAM of a cryptoflex card"""
diff --git a/virtualsmartcard/src/vpicc/virtualsmartcard/cards/nPA.py b/virtualsmartcard/src/vpicc/virtualsmartcard/cards/nPA.py
index b347230..2a75f64 100644
--- a/virtualsmartcard/src/vpicc/virtualsmartcard/cards/nPA.py
+++ b/virtualsmartcard/src/vpicc/virtualsmartcard/cards/nPA.py
@@ -26,7 +26,7 @@ import hashlib, struct
 from os import urandom
 from chat import CHAT
 
-class nPA__AT_CRT(ControlReferenceTemplate):
+class nPA_AT_CRT(ControlReferenceTemplate):
     def __init__(self):
         ControlReferenceTemplate(CRT_TEMPLATE["AT"])