Make uppercase tokens work