Fixes #20: "Maximum recursion depth exceeded"