The index i was being overwritten in another place as well.
Authored by: bugman 2008-07-04
Parent: [r6712]
Child: [r6714]
