ticket:4 fixed mistakes