better node drop handling