Make icall safe again (#946)