Fix path matching