diff --git a/reactos/lib/drivers/ip/transport/datagram/datagram.c b/reactos/lib/drivers/ip/transport/datagram/datagram.c
index 53dd6331ea9..1a44bfd9750 100644
--- a/reactos/lib/drivers/ip/transport/datagram/datagram.c
+++ b/reactos/lib/drivers/ip/transport/datagram/datagram.c
@@ -135,16 +135,15 @@ VOID DGDeliverData(
 	      RTAIPAddress = (PTA_IP_ADDRESS)Current->ReturnInfo->RemoteAddress;
 	      RTAIPAddress->TAAddressCount = 1;
 	      RTAIPAddress->Address->AddressType = TDI_ADDRESS_TYPE_IP;
+          RTAIPAddress->Address->AddressLength = TDI_ADDRESS_LENGTH_IP;
 	      RTAIPAddress->Address->Address->sin_port = SrcPort;
+          RTAIPAddress->Address->Address->in_addr = SrcAddress->Address.IPv4Address;
+          RtlZeroMemory(RTAIPAddress->Address->Address->sin_zero, 8);
 
 	      TI_DbgPrint(MAX_TRACE, ("(A: %08x) Addr %08x Port %04x\n",
 				      RTAIPAddress,
 				      SrcAddress->Address.IPv4Address, SrcPort));
 
-	      RtlCopyMemory( &RTAIPAddress->Address->Address->in_addr,
-			     &SrcAddress->Address.IPv4Address,
-			     sizeof(SrcAddress->Address.IPv4Address) );
-
               ReferenceObject(AddrFile);
               UnlockObject(AddrFile, OldIrql);