Fixed some bugs with collection