fix some behaviors