fixed refreshing issues v1.1