Fix token clearance bug