Fix fatal issue