Fix bug
Add new method