Fixed file masking/matching