Better fix for token access problem.