Fixed loop-indices
Merge conflict