Fix arg loss when relaunching