Fix services commands going through said service