fix collection repeat bugs