Fixed #2080 by removing the check for nodeType != 1. It was put in to limit the...