Fix bug
Add condition