Collection Service fixed