Merge pull request #799 from eimlav/string-fix