A fix for a possible installer crash