Better refreshing, #968