Fix grid refresh issue