diff --git a/firmware/libcommon/source/cciddriver.c b/firmware/libcommon/source/cciddriver.c
index 901e415..8cf28ca 100644
--- a/firmware/libcommon/source/cciddriver.c
+++ b/firmware/libcommon/source/cciddriver.c
@@ -83,8 +83,6 @@
 /// Driver structure for an CCID device
 typedef struct {
 
-    /// Standard USB device driver instance
-    USBDDriver             usbdDriver;
     /// CCID message
     S_ccid_bulk_in_header  sCcidMessage;
     /// CCID command
@@ -889,7 +887,7 @@
     else if (USBGenericRequest_GetType(pRequest) == USBGenericRequest_STANDARD) {
 
         // Forward request to the standard handler
-        USBDDriver_RequestHandler(&(ccidDriver.usbdDriver), pRequest);
+        USBDDriver_RequestHandler(USBD_GetDriver(), pRequest);
     }
     else {