Fixed #175, Fixed problem of orphan services