Fixed token issue