better handle changed nodes