Fix off-by-one with column handling