diff --git a/Laptop/PostalService.cpp b/Laptop/PostalService.cpp
index f4312755..28c2eb20 100644
--- a/Laptop/PostalService.cpp
+++ b/Laptop/PostalService.cpp
@@ -328,7 +328,11 @@ BOOLEAN CPostalService::DeliverShipment(UINT16 usShipmentID)
 					uiCount++;
 				}
 
-				ubItemsDelivered -= ubTempNumItems;
+				if (ubTempNumItems > 0)
+					ubItemsDelivered -= ubTempNumItems;
+				// WANNE: Temporary Bugfix, because we always get an endless loop in the while (ubTempNumItems is always 0 and therefore ubItemsDelivered always > 0!!)
+				else
+					ubItemsDelivered -= 1;
 			}
 		}
 
diff --git a/ja2_2005Express.vcproj b/ja2_2005Express.vcproj
index acb9b17c..be849283 100644
--- a/ja2_2005Express.vcproj
+++ b/ja2_2005Express.vcproj
@@ -17,7 +17,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="D:\misc\1.13\JA2 - English"
+			OutputDirectory="C:\Games\Jagged Alliance 2 EN"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
 			InheritedPropertySheets=".\ja2_2005Express.vsprops;.\ja2_2005ExpressDebug.vsprops"