diff --git a/dll/windivert.c b/dll/windivert.c
index 77af5d8..5fb8ece 100644
--- a/dll/windivert.c
+++ b/dll/windivert.c
@@ -593,8 +593,8 @@ extern BOOL WinDivertRecv(HANDLE handle, PVOID pPacket, UINT packetLen,
 {
     WINDIVERT_IOCTL ioctl;
     memset(&ioctl, 0, sizeof(ioctl));
-    ioctl.recv.addr = (UINT64)addr;
-    ioctl.recv.addr_len_ptr = (UINT64)NULL;
+    ioctl.recv.addr = (UINT64)(ULONG_PTR)addr;
+    ioctl.recv.addr_len_ptr = (UINT64)(ULONG_PTR)NULL;
     return WinDivertIoControl(handle, IOCTL_WINDIVERT_RECV, &ioctl,
         pPacket, packetLen, readLen);
 }
@@ -608,8 +608,8 @@ extern BOOL WinDivertRecvEx(HANDLE handle, PVOID pPacket, UINT packetLen,
 {
     WINDIVERT_IOCTL ioctl;
     memset(&ioctl, 0, sizeof(ioctl));
-    ioctl.recv.addr = (UINT64)addr;
-    ioctl.recv.addr_len_ptr = (UINT64)pAddrLen;
+    ioctl.recv.addr = (UINT64)(ULONG_PTR)addr;
+    ioctl.recv.addr_len_ptr = (UINT64)(ULONG_PTR)pAddrLen;
     if (flags != 0)
     {
         SetLastError(ERROR_INVALID_PARAMETER);
@@ -635,7 +635,7 @@ extern BOOL WinDivertSend(HANDLE handle, const VOID *pPacket, UINT packetLen,
 {
     WINDIVERT_IOCTL ioctl;
     memset(&ioctl, 0, sizeof(ioctl));
-    ioctl.send.addr = (UINT64)addr;
+    ioctl.send.addr = (UINT64)(ULONG_PTR)addr;
     ioctl.send.addr_len = sizeof(WINDIVERT_ADDRESS);
     return WinDivertIoControl(handle, IOCTL_WINDIVERT_SEND, &ioctl,
         (PVOID)pPacket, packetLen, writeLen);
@@ -650,7 +650,7 @@ extern BOOL WinDivertSendEx(HANDLE handle, const VOID *pPacket, UINT packetLen,
 {
     WINDIVERT_IOCTL ioctl;
     memset(&ioctl, 0, sizeof(ioctl));
-    ioctl.send.addr = (UINT64)addr;
+    ioctl.send.addr = (UINT64)(ULONG_PTR)addr;
     ioctl.send.addr_len = addrLen;
     if (flags != 0)
     {
diff --git a/inf/windivert32.inf b/inf/windivert32.inf
index 9269328..30da774 100644
--- a/inf/windivert32.inf
+++ b/inf/windivert32.inf
@@ -4,7 +4,7 @@ Class = WFPCALLOUTS
 ClassGuid = {57465043-616C-6C6F-7574-5F636C617373}
 Provider = %Basil%
 CatalogFile = WinDivert32.Cat
-DriverVer = 08/08/2019,2.1.0
+DriverVer = 08/08/2019,2.2.0
 
 [SourceDisksNames]
 1 = %DiskName%
diff --git a/inf/windivert64.inf b/inf/windivert64.inf
index 2949c2f..c5e2cdb 100644
--- a/inf/windivert64.inf
+++ b/inf/windivert64.inf
@@ -4,7 +4,7 @@ Class = WFPCALLOUTS
 ClassGuid = {57465043-616C-6C6F-7574-5F636C617373}
 Provider = %Basil%
 CatalogFile = WinDivert64.Cat
-DriverVer = 08/08/2019,2.1.0
+DriverVer = 08/08/2019,2.2.0
 
 [SourceDisksNames]
 1 = %DiskName%