Fix variable column count