Fix token refresh (again)