ticket:5 fixed some mistakes