Fixed refresh handling