Forgot to include important part of previous fix.

This is embarrassing, I actually put the i in the wrong location. Now it is
*really* fixed, hopefully...