diff --git a/dll/windivert_helper.c b/dll/windivert_helper.c
index 537602b..869c7d5 100644
--- a/dll/windivert_helper.c
+++ b/dll/windivert_helper.c
@@ -522,7 +522,8 @@ BOOL WinDivertHelperParsePacket(const VOID *pPacket, UINT packetLen,
     }
     if (ppNext != NULL)
     {
-        *ppNext = (info.Extended? (PVOID)((UINT8 *)pPacket + packetLen): NULL);
+        *ppNext = (info.Extended? (PVOID)((UINT8 *)pPacket +
+            (info.HeaderLength + info.PayloadLength)): NULL);
     }
     if (pNextLen != NULL)
     {
diff --git a/sys/windivert.vcxproj b/sys/windivert.vcxproj
index aa54f85..6033836 100644
--- a/sys/windivert.vcxproj
+++ b/sys/windivert.vcxproj
@@ -45,8 +45,6 @@
    <Platform>x64</Platform>
   </ProjectConfiguration>
  </ItemGroup>
- <ItemGroup>
- </ItemGroup>
  <ItemGroup>
   <ResourceCompile Include="windivert.rc" />
  </ItemGroup>