Fixed Refreshing order