Fixed: Error due to recursion (stack overflow)