Fixing: directory handling