The previous commit introduced a new crash. This fixes it.