Fix issue with improper mapping of node elements