Fix invalid next