Fix fatal error after last fix