Fixed MacroDataProvider