Re-fix providers