Merge "Fixed wrong loop variable (AKA: I, Y U NO J?)" into nyc-dev