Essentially the same as issue #1, but w.r.t services
Essentially the same as issue #1, but w.r.t services