Fix token issue?