better way of fixing "renew all"