fix for tokens with digits