data issue fix for grid