Really fix the node drop