bug fixes in collections