Fix refresh issue