Quick fix Issue #7 with recursion error