Behavior bug fix