Fix from stack overflow