Fix variables in icomp