Service class fix