Fixes problems with ignore indices and a loop that assumed all indices
would be found