Matching directory fix to master