Try a different ordering to fix directory forwardings