Jon: Fixed collection-api