Actual fix for the Data Manager Refresh issue.