Fixed stack overflow errors