Workaround for fixing node type attribute issue