Behavior fix 2