Fixed how CSI works