diff --git a/src/input/ipa.c b/src/input/ipa.c
index fc1ca50..995d2c3 100644
--- a/src/input/ipa.c
+++ b/src/input/ipa.c
@@ -459,8 +459,7 @@
 
 	switch (msg_type) {
 	case IPAC_MSGT_ID_RESP:
-		rc = ipa_ccm_idtag_parse(&tlvp, (uint8_t *)msg->l2h + 2,
-					 msgb_l2len(msg)-2);
+		rc = ipa_ccm_id_resp_parse(&tlvp, (const uint8_t *)msg->l2h+1, msgb_l2len(msg)-1);
 		if (rc < 0) {
 			LOGIPA(conn, LOGL_ERROR, "IPA CCM RESPonse with "
 				"malformed TLVs\n");
diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c
index 7d3845e..3d2fa44 100644
--- a/src/input/ipaccess.c
+++ b/src/input/ipaccess.c
@@ -119,8 +119,7 @@
 	case IPAC_MSGT_ID_RESP:
 		DEBUGP(DLMI, "ID_RESP\n");
 		/* parse tags, search for Unit ID */
-		ret = ipa_ccm_idtag_parse(&tlvp, (uint8_t *)msg->l2h + 2,
-						msgb_l2len(msg)-2);
+		ret = ipa_ccm_id_resp_parse(&tlvp, (const uint8_t *)msg->l2h+1, msgb_l2len(msg)-1);
 		DEBUGP(DLMI, "\n");
 		if (ret < 0) {
 			LOGP(DLINP, LOGL_ERROR, "IPA response message "