Fix token issue