Don't forget nodes from function graphs

Test_data is passing again