Improve how pinned providers are handled

Fixed