Fixed defect for grid
Need to get rid of duplicates