Fix bug + change root