Fixed #331 -- recursion bug.