diff --git a/src/libmsc/msc_t.c b/src/libmsc/msc_t.c
index 8eefccc..6b96c26 100644
--- a/src/libmsc/msc_t.c
+++ b/src/libmsc/msc_t.c
@@ -75,7 +75,7 @@
 	int rc;
 	uint64_t started_at;
 	uint64_t ho_nr;
-	char ho_nr_str[VLR_MSISDN_LENGTH+1];
+	char ho_nr_str[GSM23003_MSISDN_MAX_DIGITS+1];
 	struct gsm_network *net = msc_t_net(msc_t);
 	bool usable = false;
 
@@ -417,7 +417,7 @@
 	struct rtp_stream *rtp_cn = msc_t->inter_msc.call_leg? msc_t->inter_msc.call_leg->rtp[RTP_TO_CN] : NULL;
 	/* Since it's BCD, it needs rounded-up half the char* length of an MSISDN plus a type byte.
 	 * But no need to introduce obscure math to save a few stack bytes, just have more. */
-	uint8_t msisdn_enc_buf[VLR_MSISDN_LENGTH + 1];
+	uint8_t msisdn_enc_buf[GSM23003_MSISDN_MAX_DIGITS+1];
 	/* Copy an_apdu and an_apdu->e_info in "copy-on-write" method, because they are const and we
 	 * need to add the Handover Number to e_info. */
 	const struct ran_handover_request_ack *r = &ran_dec->handover_request_ack;
diff --git a/src/libmsc/sms_queue.c b/src/libmsc/sms_queue.c
index 2c380b2..6346c1d 100644
--- a/src/libmsc/sms_queue.c
+++ b/src/libmsc/sms_queue.c
@@ -66,7 +66,7 @@
 
 	struct llist_head pending_sms;
 
-	char last_msisdn[VLR_MSISDN_LENGTH+1];
+	char last_msisdn[GSM23003_MSISDN_MAX_DIGITS+1];
 };
 
 static int sms_subscr_cb(unsigned int, unsigned int, void *, void *);