Bugfix ProviderFactory