Jon A. Cruz - 2011-07-19

Patch to fix the index overrun