Fix for bug related to refactoring provider class.