Fix Refresh Issue