Removed recursion issue