ICC-31 fixed