Fixed folder recursion