Fix bug
Close properly