fixing collection bugs