fix some collect bugs