Forgot to include important part of previous fix.

We now actually need the index i.