Avoid endless recursion
All tests passing