Service Monitor fixed