Thaddius fix so no one gets too many stacks