Fix $oldToken not defined