Correcting double call to next when upgrading the token