Fix bug with