Bugfix serviceProvider.