Fix collection support.