ticket:2 fixed some behaviors