Fix fatal bug of previous commit