Update component of behavior
Merge pull request #1337 from Honry/update-component-behavior

Update component of behavior