Fixed token check