Some fixing in token addition