Fix problems with multiple providers