Folder bug fix