Fixing get tokens