(Cal) Fix bug with CS connection in cal