Fixed emtpy column args handling (again)