fixing XNode once again