diff --git a/src/unix/core.c b/src/unix/core.c
index 118bc5759..cde4dc444 100644
--- a/src/unix/core.c
+++ b/src/unix/core.c
@@ -1533,7 +1533,7 @@ int uv_os_environ(uv_env_item_t** envitems, int* count) {
 
 fail:
   for (i = 0; i < cnt; i++) {
-    envitem = &(*envitems)[cnt];
+    envitem = &(*envitems)[i];
     uv__free(envitem->name);
   }
   uv__free(*envitems);
diff --git a/src/win/util.c b/src/win/util.c
index 9fb5694c9..ded589c75 100644
--- a/src/win/util.c
+++ b/src/win/util.c
@@ -1280,7 +1280,7 @@ fail:
   FreeEnvironmentStringsW(env);
 
   for (i = 0; i < cnt; i++) {
-    envitem = &(*envitems)[cnt];
+    envitem = &(*envitems)[i];
     uv__free(envitem->name);
   }
   uv__free(*envitems);