fixing issue with encoded character #39;