--- channels/chan_zap.c-	2004-05-28 08:48:31.000000000 +0100
+++ channels/chan_zap.c	2004-05-28 08:48:58.000000000 +0100
@@ -4790,7 +4790,7 @@
 		      }
  		   }
 	     	}
-		else if (p->use_callerid) {
+		if (p->use_callerid) {
 			cs = callerid_new();
 			if (cs) {
 #if 1
@@ -4829,7 +4829,7 @@
 
 						curRingData[receivedRingT] = p->ringt;
 
- 						if (p->ringt < RINGT/2)
+ 						/* if (p->ringt < RINGT/2) */
 							break;
 						++receivedRingT; /* Increment the ringT counter so we can match it against
 								values in zapata.conf for distinctive ring */