Try to solve refresh issue (part I)