Fix subfolder change