Issue 328: bug 6 need verify
Issue 328: bug 6 fixed
Issue 328: bug 4 fixed