Bugfix: Use the service manager right away