Fixed issue with NodeChange not handling the current element properly.