Fix None token