Mixed up next and current q