Fixed post refresh issue