bug fixes in collection