echan

I know the issue. I will leave it up to you how to address it, because it's kind of funky. When I wrote this, my assumption was that for collections...

This one is irrelevant now I think @zobront