Fixed subfolder issue