Fix fatal bug