Fixed the grid array handling