diff --git a/src/mhd2/daemon_set_options.c b/src/mhd2/daemon_set_options.c
index b3182652..356db9e7 100644
--- a/src/mhd2/daemon_set_options.c
+++ b/src/mhd2/daemon_set_options.c
@@ -26,7 +26,8 @@ MHD_daemon_set_options (struct MHD_Daemon *daemon,
 
   for (i=0;i<options_max_num;i++)
   {
-    switch (options[i].opt) {
+    const struct MHD_DaemonOptionAndValue *const option = options + i;
+    switch (option->opt) {
     case MHD_D_OPTION_WORK_MODE:
       daemon->settings.work_mode = option->val.work_mode;
       continue;
diff --git a/src/mhd2/response_set_options.c b/src/mhd2/response_set_options.c
index 5f42ae8e..89ad9e28 100644
--- a/src/mhd2/response_set_options.c
+++ b/src/mhd2/response_set_options.c
@@ -25,7 +25,8 @@ MHD_response_set_options (struct MHD_Response *response,
 
   for (i=0;i<options_max_num;i++)
   {
-    switch (options[i].opt) {
+    const struct MHD_ResponseOptionAndValue *const option = options + i;
+    switch (option->opt) {
     case MHD_R_OPTION_REUSABLE:
       response->settings.reusable = option->val.reusable;
       continue;