diff --git a/src/capwap/cwmsg_init.c b/src/capwap/cwmsg_init.c
index 4468741a..812ac5c8 100644
--- a/src/capwap/cwmsg_init.c
+++ b/src/capwap/cwmsg_init.c
@@ -51,7 +51,7 @@ void cwmsg_init(struct cwmsg * cwmsg, uint8_t *buffer, int type, int seqnum, str
 	cwmsg->ctrlhdr=cwmsg->trnsprthdr+hlen; 
 	cwmsg->msgelems=cwmsg->ctrlhdr+8;
 
-	*((uint32_t*)(cwmsg->ctrlhdr))=htonl(type+CWIANA_ENTERPRISE_NUMBER*256);
+	*((uint32_t*)(cwmsg->ctrlhdr))=htonl(type); 
 
 	cwmsg->pos=0;
 	cwmsg->hlen=hlen/4;