Fix bug & change route