fix subdir issues