Fixed updating issue to use next pointer