Issue #2358147 by DuttonMa: Fixed Code improvement in install.