Bugfix service dependency loop with plugins