diff --git a/include/WinStd/EAP.h b/include/WinStd/EAP.h
index efa38c66..b7148684 100644
--- a/include/WinStd/EAP.h
+++ b/include/WinStd/EAP.h
@@ -170,9 +170,10 @@ namespace winstd
         ///
         /// Delete a pointer
         ///
-        void operator()(BYTE *_Ptr) const
+        template <class _T>
+        void operator()(_T *_Ptr) const
         {
-            EapHostPeerFreeMemory(_Ptr);
+            EapHostPeerFreeMemory((BYTE*)_Ptr);
         }
     };