Fixed Token overwriting