diff --git a/src/lualib/ArrayFrom.ts b/src/lualib/ArrayFrom.ts
index 67e78d914..3742d7949 100644
--- a/src/lualib/ArrayFrom.ts
+++ b/src/lualib/ArrayFrom.ts
@@ -28,8 +28,9 @@ export function __TS__ArrayFrom(
             result.push(v);
         }
     } else {
-        for (const [i, v] of arrayLikeIterator(arrayLike)) {
-            result.push(mapFn.call(thisArg, v, i - 1));
+        let i = 0;
+        for (const [, v] of arrayLikeIterator(arrayLike)) {
+            result.push(mapFn.call(thisArg, v, i++));
         }
     }
     return result;
diff --git a/test/unit/builtins/array.spec.ts b/test/unit/builtins/array.spec.ts
index a59d1ee04..1e952a162 100644
--- a/test/unit/builtins/array.spec.ts
+++ b/test/unit/builtins/array.spec.ts
@@ -753,6 +753,14 @@ test.each([
     util.testExpression`Array.from(${valueString})`.expectToMatchJsResult();
 });
 
+// https://github.com/TypeScriptToLua/TypeScriptToLua/issues/1576
+test("array.from with non-array iterable (#1576)", () => {
+    util.testFunction`
+        const map = new Map().set(1, 2);
+        return Array.from(map, ([v,k]) => ({k,v}));
+    `.expectToMatchJsResult();
+});
+
 // Array.of
 test.each(["1, 2, 3", "", "...[1, 2, 3], 4, 5, 6"])("Array.of(%p)", valueString => {
     util.testExpression`Array.of(${valueString})`.expectToMatchJsResult();