diff --git a/src/libnm-glib-aux/nm-enum-utils.c b/src/libnm-glib-aux/nm-enum-utils.c
index 0d63278045..212c0021e0 100644
--- a/src/libnm-glib-aux/nm-enum-utils.c
+++ b/src/libnm-glib-aux/nm-enum-utils.c
@@ -325,7 +325,7 @@ _nm_utils_enum_get_values(GType type, int from, int to)
     GPtrArray *values      = g_ptr_array_sized_new(values_full->len + 1);
 
     for (i = 0; i < values_full->len; i++) {
-        NMUtilsEnumValueInfoFull *v = &g_array_index(values_full, NMUtilsEnumValueInfoFull, i);
+        NMUtilsEnumValueInfoFull *v = &nm_g_array_index(values_full, NMUtilsEnumValueInfoFull, i);
         g_ptr_array_add(values, (gpointer) v->nick);
     }
 
@@ -418,8 +418,9 @@ _nm_utils_enum_get_values_full(GType                       type,
         g_array_set_clear_func(array, (GDestroyNotify) _free_value_info_full);
 
         for (i = 0; i < array->len; i++) {
-            NMUtilsEnumValueInfoFull *vi_full = &g_array_index(array, NMUtilsEnumValueInfoFull, i);
-            GPtrArray                *aliases = g_ptr_array_new();
+            NMUtilsEnumValueInfoFull *vi_full =
+                &nm_g_array_index(array, NMUtilsEnumValueInfoFull, i);
+            GPtrArray *aliases = g_ptr_array_new();
 
             const NMUtilsEnumValueInfo *vi;
             for (vi = value_infos; vi && vi->nick; vi++) {
diff --git a/src/nmcli/gen-metadata-nm-settings-nmcli.c b/src/nmcli/gen-metadata-nm-settings-nmcli.c
index f8dc303628..2def909565 100644
--- a/src/nmcli/gen-metadata-nm-settings-nmcli.c
+++ b/src/nmcli/gen-metadata-nm-settings-nmcli.c
@@ -266,7 +266,7 @@ _append_enum_valid_values(GType                       g_type,
     GArray      *values = _nm_utils_enum_get_values_full(g_type, min, max, value_infos);
 
     for (i = 0; i < values->len; i++) {
-        NMUtilsEnumValueInfoFull *val = &g_array_index(values, NMUtilsEnumValueInfoFull, i);
+        NMUtilsEnumValueInfoFull *val = &nm_g_array_index(values, NMUtilsEnumValueInfoFull, i);
 
         g_string_assign(names, val->nick);