diff --git a/library/MNCC_EncDec.cc b/library/MNCC_EncDec.cc
index cdfe3ed..b4937e7 100644
--- a/library/MNCC_EncDec.cc
+++ b/library/MNCC_EncDec.cc
@@ -47,8 +47,11 @@
 					(GSM48__bcap__transp) in->data.transp,
 					(GSM48__bcap__modem__type) in->data.modem_type);
 
-	for (unsigned int i = 0; i < ARRAY_SIZE(in->speech_ver); i++)
-		vers[0] = in->speech_ver[0];
+	for (unsigned int i = 0; i < ARRAY_SIZE(in->speech_ver); i++) {
+		vers[i] = in->speech_ver[i];
+		if (vers[i] == -1)
+			break;
+	}
 
 	return MNCC__bearer__cap(in->transfer, in->mode, in->coding, in->radio, in->speech_ctm,
 				 vers, data);