Fixed folder handling