Adding fix for string issue.