improved StopNode support