Fix another critical bug