Merge pull request #1181 from grandoc/3.3

fix some trad