Fix bug
Edit
Add behavior