Fix for multiple tokens of the same name