Fix the Service issues of previous commit