Fixes #110     Changes to switching providers