Fix - Flickering when refreshing grid