ticket:3 fixed mistakes