Broken, but better folder handling