Another bit of csi relay fix