diff --git a/src/cw/Makefile b/src/cw/Makefile
index 5ea1f2b7..2742e37d 100644
--- a/src/cw/Makefile
+++ b/src/cw/Makefile
@@ -64,7 +64,6 @@ CWSRC=\
 	cw_write_radio_element.c\
 	cw_detect_nat.c\
 	cw_read_from.c \
-	cw_in_generic_struct.c\
 
 #	cw_in_check_disc_req.c\
 #	cw_in_check_img_data_req_ac.c\
@@ -77,6 +76,7 @@ CWSRC=\
 #	cw_process_element.c\
 #	cw_out_generic_struct.c\
 	cw_in_radio_generic_struct.c\
+	cw_in_generic_struct.c\
 
 KTVSRC=\
 	cfg.c\
diff --git a/src/mod/cisco/cisco_actions.c b/src/mod/cisco/cisco_actions.c
index adcde48f..7d956488 100644
--- a/src/mod/cisco/cisco_actions.c
+++ b/src/mod/cisco/cisco_actions.c
@@ -1993,12 +1993,13 @@ static struct cw_ElemHandler handlers70[] = {
 		CISCO_LWELEM_ADD_WLAN,			/* Element ID */
 		CW_VENDOR_ID_CISCO,CW_PROTO_LWAPP,	/* Vendor / Proto */
 		7,1117,					/* min/max length */
-		cisco_add_lwwlan,			/* type */
+		CW_TYPE_STRUCT,				/* type */
 		"radio/wlan/add-lw-wlan",		/* Key */
-		cw_in_generic_struct,			/* get */
+		cw_in_generic,				/* get */
 		cw_out_traverse,			/* put */
 		cisoc_add_lwwlan_mkkey,
-		cisco_patch_add_lwwlan
+		cisco_patch_add_lwwlan,
+		cisco_add_lwwlan,
 	}
 	,