diff --git a/libs/freetdm/src/isdn/Q931ie.c b/libs/freetdm/src/isdn/Q931ie.c
index 1435e3abc7..46e0173aa4 100644
--- a/libs/freetdm/src/isdn/Q931ie.c
+++ b/libs/freetdm/src/isdn/Q931ie.c
@@ -819,7 +819,8 @@ L3INT Q931Uie_CallingNum(Q931_TrunkInfo_t *pTrunk, ie *pIE, L3UCHAR * IBuf, L3UC
         pie->Digit[x] = IBuf[Octet+Off] & 0x7f;
         Off++;
         x++;
-    }while((IBuf[Octet+Off]&0x80) != 0 && x < 20);
+/*    }while((IBuf[Octet+Off]&0x80) != 0 && x < 20); Temporary dirty hack. */
+	}while(Octet+Off < IESize);
 
     Q931IESizeTest(Q931E_CALLINGNUM);