Fix token once more