Fast patch for Issue #7 with recursion error