Replace with for loop
Commit 1412181529