Fix bug too much recursivity