Better handling of repeated retirements