Another fix for collections

* The 'tracks' function seems not work btw