fix some raise condition