diff --git a/src/rsl.c b/src/rsl.c
index ca2f7de..c864b12 100644
--- a/src/rsl.c
+++ b/src/rsl.c
@@ -161,13 +161,13 @@
 	} else if ((chan_nr & 0xc0) == RSL_CHAN_SDCCH8_ACCH) {
 		*type = RSL_CHAN_SDCCH8_ACCH;
 		*subch = (chan_nr >> 3) & 0x7;
-	} else if (chan_nr == 0x10) {
+	} else if ((chan_nr & 0xf8) == RSL_CHAN_BCCH) {
 		*type = RSL_CHAN_BCCH;
 		*subch = 0;
-	} else if (chan_nr == 0x11) {
+	} else if ((chan_nr & 0xf8) == RSL_CHAN_RACH) {
 		*type = RSL_CHAN_RACH;
 		*subch = 0;
-	} else if (chan_nr == 0x12) {
+	} else if ((chan_nr & 0xf8) == RSL_CHAN_PCH_AGCH) {
 		*type = RSL_CHAN_PCH_AGCH;
 		*subch = 0;
 	} else