Fixed existing directory problems