Fix column count