Folder support, bugfix