diff --git a/src/config.c b/src/config.c
index cd7585400230cc1e9b8a5c0daa1699c65c697e38..e625c48deae1a94dc84ff4249f4629423f7d5396 100644
--- a/src/config.c
+++ b/src/config.c
@@ -577,22 +577,22 @@ static int cntlr_config_get_base(struct controller_config *c,
 		CNTLR_DEFAULT_PCP,
 		CNTLR_ENABLE_TS,
 		CNTLR_PROFILE,
+
 		NUM_CNTLR_ATTRS
 	};
-	const struct uci_parse_option opts[] = {
-		{ .name = "enabled", .type = UCI_TYPE_STRING },
-		{ .name = "registrar", .type = UCI_TYPE_STRING },
-		{ .name = "debug", .type = UCI_TYPE_STRING },
-		{ .name = "resend_num", .type = UCI_TYPE_STRING },
-		{ .name = "bcn_metrics_max_num", .type = UCI_TYPE_STRING },
-		{ .name = "initial_channel_scan", .type = UCI_TYPE_STRING },
-		{ .name = "channel_plan", .type = UCI_TYPE_STRING },
-		{ .name = "allow_bgdfs", .type = UCI_TYPE_STRING },
-		{ .name = "primary_vid", .type = UCI_TYPE_STRING },
-		{ .name = "default_pcp", .type = UCI_TYPE_STRING },
-		{ .name = "enable_ts", .type = UCI_TYPE_STRING },
-		{ .name = "enable_ts", .type = UCI_TYPE_STRING },
-		{ .name = "profile", .type = UCI_TYPE_STRING },
+	const struct uci_parse_option opts[NUM_CNTLR_ATTRS] = {
+		[CNTLR_ENABLED] = { .name = "enabled", .type = UCI_TYPE_STRING },
+		[CNTLR_REGISTRAR] = { .name = "registrar", .type = UCI_TYPE_STRING },
+		[CNTLR_DEBUG] = { .name = "debug", .type = UCI_TYPE_STRING },
+		[CNTLR_RESEND_NUM] = { .name = "resend_num", .type = UCI_TYPE_STRING },
+		[CNTLR_BCN_METRICS_MAX_NUM] = { .name = "bcn_metrics_max_num", .type = UCI_TYPE_STRING },
+		[CNTLR_INITIAL_CHANNEL_SCAN] = { .name = "initial_channel_scan", .type = UCI_TYPE_STRING },
+		[CNTLR_CHANNEL_PLAN_TIMEOUT] = { .name = "channel_plan", .type = UCI_TYPE_STRING },
+		[CNTLR_BGDFS_TIMEOUT] = { .name = "allow_bgdfs", .type = UCI_TYPE_STRING },
+		[CNTLR_PRIMARY_VID] = { .name = "primary_vid", .type = UCI_TYPE_STRING },
+		[CNTLR_DEFAULT_PCP] = { .name = "default_pcp", .type = UCI_TYPE_STRING },
+		[CNTLR_ENABLE_TS] = { .name = "enable_ts", .type = UCI_TYPE_STRING },
+		[CNTLR_PROFILE] = { .name = "profile", .type = UCI_TYPE_STRING },
 	};
 	struct uci_option *tb[NUM_CNTLR_ATTRS];