diff --git a/src/mod/capwap/capwap_actions_wtp.c b/src/mod/capwap/capwap_actions_wtp.c
index ca72cec2..5f98d505 100644
--- a/src/mod/capwap/capwap_actions_wtp.c
+++ b/src/mod/capwap/capwap_actions_wtp.c
@@ -186,6 +186,29 @@ static cw_action_out_t actions_out[] = {
 	}
 	,
 
+	/* WTP Board Data - Discovery Request */
+	{
+		.msg_id = CW_MSG_DISCOVERY_REQUEST, 
+		.elem_id  = CW_ELEM_WTP_BOARD_DATA,
+		.item_id = CW_ITEM_WTP_BOARD_DATA, 
+		.out = cw_out_wtp_board_data,
+		.get = cw_out_get_config,
+		.mand = 1
+	}
+	,
+
+	/* WTP Descriptor - Discover Request */
+	{
+		.msg_id = CW_MSG_DISCOVERY_REQUEST, 
+		.elem_id  = CW_ELEM_WTP_DESCRIPTOR,
+		.item_id = CW_ITEM_WTP_DESCRIPTOR, 
+		.out = capwap_out_wtp_descriptor,
+		//.get = cw_out_get_config,
+		.mand = 1
+	}
+
+	,
+
 	/* WTP Frame TunnelMode - Discovery Request */
 	{
 		.msg_id = CW_MSG_DISCOVERY_REQUEST, 
@@ -209,29 +232,6 @@ static cw_action_out_t actions_out[] = {
 	,
 
 
-	/* WTP Board Data - Discovery Request */
-	{
-		.msg_id = CW_MSG_DISCOVERY_REQUEST, 
-		.elem_id  = CW_ELEM_WTP_BOARD_DATA,
-		.item_id = CW_ITEM_WTP_BOARD_DATA, 
-		.out = cw_out_wtp_board_data,
-	//	.get = cw_out_get_config,
-		.mand = 1
-	}
-	,
-
-	/* WTP Descriptor */
-	{
-		.msg_id = CW_MSG_DISCOVERY_REQUEST, 
-		.elem_id  = CW_ELEM_WTP_DESCRIPTOR,
-		.item_id = CW_ITEM_WTP_DESCRIPTOR, 
-		.out = capwap_out_wtp_descriptor,
-		//.get = cw_out_get_config,
-		.mand = 1
-	}
-
-	,
-
 	/* ---------------------------------------------------------------
 	 * Join Request - Out
 	 */
@@ -253,7 +253,7 @@ static cw_action_out_t actions_out[] = {
 		.elem_id  = CW_ELEM_WTP_BOARD_DATA,
 		.item_id = CW_ITEM_WTP_BOARD_DATA, 
 		.out = cw_out_wtp_board_data,
-		.get = cw_out_get_outgoing,
+		.get = cw_out_get_config,
 		.mand = 1
 	}
 	,