Fixed empty directories problem