elegant providers fixes