Data Refresh fix