diff --git a/library/SGsAP_Templates.ttcn b/library/SGsAP_Templates.ttcn
index 9526080..457481e 100644
--- a/library/SGsAP_Templates.ttcn
+++ b/library/SGsAP_Templates.ttcn
@@ -69,7 +69,10 @@
 		return omit;
 	} else if (istemplatekind(digits, "*")) {
 		return *;
+	} else if (istemplatekind(digits, "?")) {
+		return ?;
 	}
+	log("tr_SGsAP_IMSI: ", digits);
 	var template IMSI imsi := {
 		iEI := '00000001'B,
 		lengthIndicator := lengthof(digits)/2 + 1,