Fixing over-eager relaunch code