diff --git a/miniupnpd/natpmp.c b/miniupnpd/natpmp.c
index ab4f4e0..edc86dc 100644
--- a/miniupnpd/natpmp.c
+++ b/miniupnpd/natpmp.c
@@ -343,11 +343,11 @@ void ProcessIncomingNATPMPPacket(int s, unsigned char *msg_buff, int len,
 							} else {
 								syslog(LOG_INFO, "NAT-PMP %s port %hu mapping removed",
 								       proto2==IPPROTO_TCP?"TCP":"UDP", eport2);
+								index--;
 							}
-						} else {
-							index++;
 						}
 					}
+					index++;
 				}
 			} else if(iport==0) {
 				resp[3] = 2;	/* Not Authorized/Refused */