Comment 1 for bug 1628844

I've committed a fix. This was an iterator issue, where removal of the items would shorten the list and cause the next iteration to skip one.

Test is now in place to catch this error.