Fix forgetful collections bug

Closes #879.

Some changes slipped in when dealing with another bug that weren't fully tested. b493d20033a23ab882f8ccf2d7d1ff1b86c48a44 should have also included the addition here.