fix #1035 by CDATA tidy
fix cannot set default dictionary
Merge pull request #1056 from chrox/fix_1035

fix #1035