Fixed #106, Avoided problem of "orphan" services