fix bug occured while refactoring provider
Merge remote-tracking branch 'origin/master'