Fix issue with new installer