Fix column off by 1 issue