Fix bug with edit token