Fixbug follow comment #6 issue 352 after review