Fixed the refresh issue