diff --git a/library/MNCC_EncDec.cc b/library/MNCC_EncDec.cc
index 2c68cb1..fef2a40 100644
--- a/library/MNCC_EncDec.cc
+++ b/library/MNCC_EncDec.cc
@@ -155,8 +155,8 @@
 			mncc.fields |= MNCC_F_SIGNAL;
 		}
 		if (in_sig.keypad().is_value()) {
-			const INTEGER &kpd = in_sig.keypad();
-			mncc.signal = kpd;
+			const CHARSTRING &kpd = in_sig.keypad();
+			mncc.signal = (int) kpd[0].get_char();
 			mncc.fields |= MNCC_F_KEYPAD;
 		}
 		mncc.more = in_sig.more();
@@ -292,8 +292,10 @@
 			sign.ssversion() = CHARSTRING(in_mncc->ssversion.info);
 		if (in_mncc->fields & MNCC_F_CCCAP)
 			sign.cccap() = MNCC__cccap(in_mncc->cccap.dtmf, in_mncc->cccap.pcp);
-		if (in_mncc->fields & MNCC_F_KEYPAD)
-			sign.keypad() = in_mncc->keypad;
+		if (in_mncc->fields & MNCC_F_KEYPAD) {
+			char kpd[2] = { (char) in_mncc->keypad, 0 };
+			sign.keypad() = CHARSTRING(kpd);
+		}
 		if (in_mncc->fields & MNCC_F_SIGNAL)
 			sign.signal() = in_mncc->signal;
 
diff --git a/library/MNCC_Types.ttcn b/library/MNCC_Types.ttcn
index 258db3f..bc7c4e6 100644
--- a/library/MNCC_Types.ttcn
+++ b/library/MNCC_Types.ttcn
@@ -303,7 +303,7 @@
 };
 
 type int MNCC_notify (0..127);
-type int MNCC_keypad (0..127);
+type charstring MNCC_keypad length (1);
 
 type enumerated MNCC_bcap {
 	GSM_MNCC_BCAP_SPEECH	(0),