better initial refresh handling