Merge VanessaE's infinite stack fix