Fixed ServiceProvider