Properly handle node drops