next node partial fix