Fix sub-directory regression, refs D162, D395