Adding extra guards to avoid CIC rolloff issues