Fix token sending