Found empty dir problem, added rough fix