Should fix directory problems