Merge pull request #1331 from Adam-Burke/master

fix: i in for loop undefined