#2416 fix double convert entities