Fixed refresh issue