Fixed Data Refresh Bug