Bug fix for 7 per row.