Fix collection and its spec