A bug fix and optimizations in CI_Table