Critical fix