Fix token system