fixing token issue