fixed bug in token choice method