Fix: Adding/Removing multiple services fails

fixes #7616