Issue 335: bug fixed, need verify