fixed capitalizing of token values