fixed refreshing issues
fixed refreshing issues