decorate_collection fix