ticket:7 fix 1-2 point