Fixing token issue