Collection handling fix.