Update to adjust column count with upstream

Adjust column count to match upstream module which fixes column count issue introduced with the 2.3 merge