Make script even more forgiving