Make sure tokens are tied to systems properly.