fix collection functions