Unique token check fix