Fix: Handle indirectly created dirs