Provider related bug fixed