Fixing issues with escape characters.