Fix issue with extra arguments not being reset on a reinstall