ICC-1 issues fixed