Bug with provider selection fixed