Fix up refresh issue