Fixed NonAttributeWrapper equals bug