Fix fileset logic