ci->target_class should be updated as well; #1418