Handling of nodes fixed