Contribution/ns string to string fix