Fix directories problem