Fixed Refreshing bug