Fix column indices