Fixed dir issue