Fix problem with services having spaces on their names