Fix column indexes