Fix issue with infinite loop on install