Fix recursion on export