Fixing issue with special chars.