Fix small bug.

We have to handle the rows and columns simultaneously so that we
can make sure to properly catch combos like "plus" signs or L shapes