Added fix for strings with ' in them.