Correction to handling of tokens