Fix bug
Refactor