ticket:5 fixed all test OK