Fixed to cope with missing columns in some rows, test added and passed