#69 fixed stackoverflow recursion issue