Fix folders problem