fix issue where some nodes might be handled twice